Re: [Libvir] [PATCH] pae/nonpae capabilities for paravirt xen guests

[David Lutterkort <dlutter redhat com>]

On Fri, 2007-03-23 at 12:24 -0700, David Lutterkort wrote:
> 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.

Jim Meyering pointed out that the newline after '<nonpae/>' was missing.
The attached patch contains that.

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:54:57.000000000 -0700
@@ -1679,10 +1679,13 @@
         if (guest_archs[i].pae) {
             r = virBufferAdd (xml,
                               "\
-      <pae/>\n\
+      <pae/>\n", -1);
+        } else {
+            r = virBufferAdd (xml,
+                              "\
       <nonpae/>\n", -1);
-            if (r == -1) goto vir_buffer_failed;
         }
+        if (r == -1) goto vir_buffer_failed;
         if (guest_archs[i].ia64_be) {
             r = virBufferAdd (xml,
                               "\