Fix listing of defined but inactive Xen domains

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=24

libvirt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 24 17:46:08 MST 2009 - jfehlig@novell.com
+
+- Fix listing of defined but inactive Xen domains
+  xen-list-defined.patch
+
 -------------------------------------------------------------------
 Tue Nov 24 10:29:03 MST 2009 - jfehlig@novell.com
 

libvirt.spec

@@ -91,7 +91,8 @@ Requires:       PolicyKit >= 0.6
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        libvirtd.init
 # Upstream patches
-Patch0:         detach-disk.patch
+Patch0:         xen-list-defined.patch
+Patch1:         detach-disk.patch
 # Need to go upstream
 Patch100:       socat.patch
 Patch101:       clone.patch
@@ -193,6 +194,7 @@ Authors:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch100 -p1
 %patch101 
 %patch102 -p1

snapshots.patch

@@ -440,7 +440,7 @@ Index: libvirt-0.7.4/src/xen/xend_internal.c
  #endif /* !PROXY */
  
  /**
-@@ -5115,6 +5202,11 @@ struct xenUnifiedDriver xenDaemonDriver
+@@ -5116,6 +5203,11 @@ struct xenUnifiedDriver xenDaemonDriver
      xenDaemonGetSchedulerType,   /* domainGetSchedulerType */
      xenDaemonGetSchedulerParameters, /* domainGetSchedulerParameters */
      xenDaemonSetSchedulerParameters, /* domainSetSchedulerParameters */

xen-list-defined.patch

@@ -0,0 +1,20 @@
+Index: libvirt-0.7.4/src/xen/xend_internal.c
+===================================================================
+--- libvirt-0.7.4.orig/src/xen/xend_internal.c
++++ libvirt-0.7.4/src/xen/xend_internal.c
+@@ -4693,13 +4693,14 @@ xenDaemonListDefinedDomains(virConnectPt
+         }
+ 
+         if (ret >= maxnames)
+-            break;
++            goto out;
+     }
+ 
+ error:
+     for (i = 0; i < ret; ++i)
+         VIR_FREE(names[i]);
+ 
++out:
+     sexpr_free(root);
+     return(ret);
+ }

xen-pv-cdrom.patch

@@ -2,7 +2,7 @@ Index: libvirt-0.7.4/src/xen/xend_internal.c
 ===================================================================
 --- libvirt-0.7.4.orig/src/xen/xend_internal.c
 +++ libvirt-0.7.4/src/xen/xend_internal.c
-@@ -5357,7 +5357,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co
+@@ -5358,7 +5358,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co
      } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
          virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst);
      } else {