[PATCH] pae/nonpae capabilities for paravirt xen guests

[David Lutterkort <dlutter@xxxxxxxxxx>]

I noticed that the guest capabilities on a xen dom0 always contain both
the pae and nonpae feature - AFAIK, you can't mix pae/nonpae guests and
hosts, and only one of the features should be there.

The attached patch contains the obvious fix.

David


Index: libvirt/src/xen_internal.c
===================================================================
--- libvirt.orig/src/xen_internal.c	2007-03-23 09:24:28.000000000 -0700
+++ libvirt/src/xen_internal.c	2007-03-23 12:05:18.000000000 -0700
@@ -1679,10 +1679,13 @@
         if (guest_archs[i].pae) {
             r = virBufferAdd (xml,
                               "\
-      <pae/>\n\
-      <nonpae/>\n", -1);
-            if (r == -1) goto vir_buffer_failed;
+      <pae/>\n", -1);
+        } else {
+            r = virBufferAdd (xml,
+                              "\
+      <nonpae/>", -1);
         }
+        if (r == -1) goto vir_buffer_failed;
         if (guest_archs[i].ia64_be) {
             r = virBufferAdd (xml,
                               "\