diff -r 5e8da0663ff8 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c	Tue Jan 30 01:23:58 2007 +0000
+++ b/xen/arch/x86/setup.c	Tue Jan 30 16:13:23 2007 +0100
@@ -803,57 +803,46 @@ void arch_get_xen_caps(xen_capabilities_
 void arch_get_xen_caps(xen_capabilities_info_t info)
 {
     char *p = info;
-    int i = 0;
     int major = xen_major_version();
     int minor = xen_minor_version();
 
 #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
 
-    i = snprintf(p, sizeof(xen_capabilities_info_t),
+    p += snprintf(p, sizeof(xen_capabilities_info_t),
                  "xen-%d.%d-x86_32 ", major, minor);
-    p += i;
     if ( hvm_enabled ) {
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
 		"hvm-%d.%d-x86_32 ", major, minor);
-	p += i;
     }
 
 #elif defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
 
-    i = snprintf(p, sizeof(xen_capabilities_info_t),
+    p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                  "xen-%d.%d-x86_32p ", major, minor);
-    p += i;
     if ( hvm_enabled )
     {
-        i = snprintf(p, sizeof(xen_capabilities_info_t),
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32 ", major, minor);
-        p += i;
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32p ", major, minor);
-        p += i;
     }
 
 #elif defined(CONFIG_X86_64)
 
-    i = snprintf(p, sizeof(xen_capabilities_info_t),
+    p += snprintf(p, sizeof(xen_capabilities_info_t),
                  "xen-%d.%d-x86_64 ", major, minor);
-    p += i;
 #ifdef CONFIG_COMPAT
-    i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+    p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                 "xen-%d.%d-x86_32p ", major, minor);
-    p += i;
 #endif
     if ( hvm_enabled )
     {
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32 ", major, minor);
-        p += i;
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32p ", major, minor);
-        p += i;
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_64 ", major, minor);
-        p += i;
     }
 
 #else