Accepting request 311498 from Virtualization

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/311498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=180

8910e063-arch-caps.patch

@@ -1,260 +0,0 @@
-commit 8910e063dbafc09695b2100c80213be569abb7ef
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Wed May 6 18:32:05 2015 -0400
-
-    caps: Fix regression defaulting to host arch
-    
-    My commit 747761a79 (v1.2.15 only) dropped this bit of logic when filling
-    in a default arch in the XML:
-    
-    -    /* First try to find one matching host arch */
-    -    for (i = 0; i < caps->nguests; i++) {
-    -        if (caps->guests[i]->ostype == ostype) {
-    -            for (j = 0; j < caps->guests[i]->arch.ndomains; j++) {
-    -                if (caps->guests[i]->arch.domains[j]->type == domain &&
-    -                    caps->guests[i]->arch.id == caps->host.arch)
-    -                    return caps->guests[i]->arch.id;
-    -            }
-    -        }
-    -    }
-    
-    That attempt to match host.arch is important, otherwise we end up
-    defaulting to i686 on x86_64 host for KVM, which is not intended.
-    Duplicate it in the centralized CapsLookup function.
-    
-    Additionally add some testcases that would have caught this.
-    
-    https://bugzilla.redhat.com/show_bug.cgi?id=1219191
-
-Index: libvirt-1.2.15/src/conf/capabilities.c
-===================================================================
---- libvirt-1.2.15.orig/src/conf/capabilities.c
-+++ libvirt-1.2.15/src/conf/capabilities.c
-@@ -607,25 +607,13 @@ virCapsDomainDataCompare(virCapsGuestPtr
-     return true;
- }
- 
--/**
-- * virCapabilitiesDomainDataLookup:
-- * @caps: capabilities to query
-- * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE
-- * @arch: Architecture to search for
-- * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT
-- * @emulator: Emulator path to search for
-- * @machinetype: Machine type to search for
-- *
-- * Search capabilities for the passed values, and if found return
-- * virCapabilitiesDomainDataLookup filled in with the default values
-- */
--virCapsDomainDataPtr
--virCapabilitiesDomainDataLookup(virCapsPtr caps,
--                                int ostype,
--                                virArch arch,
--                                int domaintype,
--                                const char *emulator,
--                                const char *machinetype)
-+static virCapsDomainDataPtr
-+virCapabilitiesDomainDataLookupInternal(virCapsPtr caps,
-+                                        int ostype,
-+                                        virArch arch,
-+                                        int domaintype,
-+                                        const char *emulator,
-+                                        const char *machinetype)
- {
-     virCapsGuestPtr foundguest = NULL;
-     virCapsGuestDomainPtr founddomain = NULL;
-@@ -730,6 +718,43 @@ virCapabilitiesDomainDataLookup(virCapsP
-     return ret;
- }
- 
-+/**
-+ * virCapabilitiesDomainDataLookup:
-+ * @caps: capabilities to query
-+ * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE
-+ * @arch: Architecture to search for
-+ * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT
-+ * @emulator: Emulator path to search for
-+ * @machinetype: Machine type to search for
-+ *
-+ * Search capabilities for the passed values, and if found return
-+ * virCapabilitiesDomainDataLookup filled in with the default values
-+ */
-+virCapsDomainDataPtr
-+virCapabilitiesDomainDataLookup(virCapsPtr caps,
-+                                int ostype,
-+                                virArch arch,
-+                                int domaintype,
-+                                const char *emulator,
-+                                const char *machinetype)
-+{
-+    virCapsDomainDataPtr ret;
-+
-+    if (arch == VIR_ARCH_NONE) {
-+        /* Prefer host arch if its available */
-+        ret = virCapabilitiesDomainDataLookupInternal(caps, ostype,
-+                                                      caps->host.arch,
-+                                                      domaintype,
-+                                                      emulator, machinetype);
-+        if (ret)
-+            return ret;
-+    }
-+
-+    return virCapabilitiesDomainDataLookupInternal(caps, ostype,
-+                                                   arch, domaintype,
-+                                                   emulator, machinetype);
-+}
-+
- static int
- virCapabilitiesFormatNUMATopology(virBufferPtr buf,
-                                   size_t ncells,
-Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args
-===================================================================
---- /dev/null
-+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args
-@@ -0,0 +1,4 @@
-+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-+/usr/bin/kvm -S -machine pc,accel=kvm -m 4096 -smp 4 -nographic \
-+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -net none \
-+-serial none -parallel none
-Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml
-===================================================================
---- /dev/null
-+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml
-@@ -0,0 +1,11 @@
-+<domain type='kvm'>
-+  <name>kvm</name>
-+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-+  <memory unit='KiB'>4194304</memory>
-+  <currentMemory unit='KiB'>4194304</currentMemory>
-+  <vcpu placement='static'>4</vcpu>
-+  <os>
-+    <type>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+</domain>
-Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args
-===================================================================
---- /dev/null
-+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args
-@@ -0,0 +1,4 @@
-+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-x86_64 -S -machine pc-0.11,accel=tcg -m 4096 -smp 4 \
-+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
-+-usb -net none -serial none -parallel none
-Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml
-===================================================================
---- /dev/null
-+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml
-@@ -0,0 +1,11 @@
-+<domain type='qemu'>
-+  <name>qemu-host</name>
-+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-+  <memory unit='KiB'>4194304</memory>
-+  <currentMemory unit='KiB'>4194304</currentMemory>
-+  <vcpu placement='static'>4</vcpu>
-+  <os>
-+    <type>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+</domain>
-Index: libvirt-1.2.15/tests/qemuxml2argvtest.c
-===================================================================
---- libvirt-1.2.15.orig/tests/qemuxml2argvtest.c
-+++ libvirt-1.2.15/tests/qemuxml2argvtest.c
-@@ -595,6 +595,8 @@ mymain(void)
-     DO_TEST("machine-usb-opt", QEMU_CAPS_MACHINE_OPT,
-             QEMU_CAPS_MACHINE_USB_OPT);
-     DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT);
-+    DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT);
-+    DO_TEST("default-qemu-host-arch", QEMU_CAPS_MACHINE_OPT);
-     DO_TEST("boot-cdrom", NONE);
-     DO_TEST("boot-network", NONE);
-     DO_TEST("boot-floppy", NONE);
-Index: libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml
-===================================================================
---- /dev/null
-+++ libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml
-@@ -0,0 +1,21 @@
-+<domain type='kvm'>
-+  <name>kvm</name>
-+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-+  <memory unit='KiB'>4194304</memory>
-+  <currentMemory unit='KiB'>4194304</currentMemory>
-+  <vcpu placement='static'>4</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/kvm</emulator>
-+    <controller type='usb' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-Index: libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml
-===================================================================
---- /dev/null
-+++ libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml
-@@ -0,0 +1,21 @@
-+<domain type='qemu'>
-+  <name>qemu-host</name>
-+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-+  <memory unit='KiB'>4194304</memory>
-+  <currentMemory unit='KiB'>4194304</currentMemory>
-+  <vcpu placement='static'>4</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc-0.11'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <controller type='usb' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-Index: libvirt-1.2.15/tests/qemuxml2xmltest.c
-===================================================================
---- libvirt-1.2.15.orig/tests/qemuxml2xmltest.c
-+++ libvirt-1.2.15/tests/qemuxml2xmltest.c
-@@ -346,6 +346,8 @@ mymain(void)
-     DO_TEST("minimal");
-     DO_TEST("machine-core-on");
-     DO_TEST("machine-core-off");
-+    DO_TEST_DIFFERENT("default-kvm-host-arch");
-+    DO_TEST_DIFFERENT("default-qemu-host-arch");
-     DO_TEST("boot-cdrom");
-     DO_TEST("boot-network");
-     DO_TEST("boot-floppy");
-Index: libvirt-1.2.15/tests/testutilsqemu.c
-===================================================================
---- libvirt-1.2.15.orig/tests/testutilsqemu.c
-+++ libvirt-1.2.15/tests/testutilsqemu.c
-@@ -354,6 +354,18 @@ virCapsPtr testQemuCapsInit(void)
-                                       NULL) == NULL)
-         goto cleanup;
- 
-+    if ((machines = testQemuAllocMachines(&nmachines)) == NULL)
-+        goto cleanup;
-+
-+    if (virCapabilitiesAddGuestDomain(guest,
-+                                      VIR_DOMAIN_VIRT_KVM,
-+                                      "/usr/bin/qemu-kvm",
-+                                      NULL,
-+                                      nmachines,
-+                                      machines) == NULL)
-+        goto cleanup;
-+    machines = NULL;
-+
-     if ((machines = testQemuAllocNewerMachines(&nmachines)) == NULL)
-         goto cleanup;
- 

apparmor-fixes.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.16/examples/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu
+--- libvirt-1.2.16.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.15/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.16/examples/apparmor/libvirt-qemu
 @@ -124,6 +124,9 @@
    # for restore
    /bin/bash rmix,

apparmor-no-mount.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/examples/apparmor/libvirt-lxc
+Index: libvirt-1.2.16/examples/apparmor/libvirt-lxc
 ===================================================================
---- libvirt-1.2.15.orig/examples/apparmor/libvirt-lxc
+--- libvirt-1.2.16.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-1.2.15/examples/apparmor/libvirt-lxc
++++ libvirt-1.2.16/examples/apparmor/libvirt-lxc
 @@ -2,39 +2,15 @@
  
    #include <abstractions/base>

blockcopy-check-dst-identical-device.patch

@@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
  src/qemu/qemu_driver.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-Index: libvirt-1.2.15/src/qemu/qemu_driver.c
+Index: libvirt-1.2.16/src/qemu/qemu_driver.c
 ===================================================================
---- libvirt-1.2.15.orig/src/qemu/qemu_driver.c
+--- libvirt-1.2.16.orig/src/qemu/qemu_driver.c
-+++ libvirt-1.2.15/src/qemu/qemu_driver.c
++++ libvirt-1.2.16/src/qemu/qemu_driver.c
-@@ -17019,6 +17019,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+@@ -16993,6 +16993,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
                         _("non-file destination not supported yet"));
          goto endjob;
      }

c0d3f608-libxl-soundhw.patch

@@ -1,33 +0,0 @@
-commit c0d3f608d6981c69f03d19252308a09545d1ab84
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Mon May 4 13:50:10 2015 -0600
-
-    libxl: support soundhw for hvm domains
-    
-    The xend driver and the parsing/formating code in src/xenconfig
-    have long supported soundhw.  Add support in the libxl driver too.
-
-Index: libvirt-1.2.15/src/libxl/libxl_conf.c
-===================================================================
---- libvirt-1.2.15.orig/src/libxl/libxl_conf.c
-+++ libvirt-1.2.15/src/libxl/libxl_conf.c
-@@ -678,6 +678,19 @@ libxlMakeDomBuildInfo(virDomainDefPtr de
-                 libxl_defbool_set(&b_info->u.hvm.hpet, 1);
-             }
-         }
-+
-+        if (def->nsounds > 0) {
-+            /*
-+             * Use first sound device.  man xl.cfg(5) describes soundhw as
-+             * a single device.  From the man page: soundhw=DEVICE
-+             */
-+            virDomainSoundDefPtr snd = def->sounds[0];
-+
-+            if (VIR_STRDUP(b_info->u.hvm.soundhw,
-+                           virDomainSoundModelTypeToString(snd->model)) < 0)
-+                return -1;
-+        }
-+
-         for (i = 0; i < def->os.nBootDevs; i++) {
-             switch (def->os.bootDevs[i]) {
-                 case VIR_DOMAIN_BOOT_FLOPPY:

disable-virCgroupGetPercpuStats-test.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/tests/vircgrouptest.c
+Index: libvirt-1.2.16/tests/vircgrouptest.c
 ===================================================================
---- libvirt-1.2.15.orig/tests/vircgrouptest.c
+--- libvirt-1.2.16.orig/tests/vircgrouptest.c
-+++ libvirt-1.2.15/tests/vircgrouptest.c
++++ libvirt-1.2.16/tests/vircgrouptest.c
 @@ -34,7 +34,6 @@
  # include "virfile.h"
  # include "virbuffer.h"

libvirt-1.2.15.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6
-size 29094868

libvirt-1.2.15.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlVG6IgACgkQRga4pd6VvB8pUACfe0uCYnQVlAKIZz0R4ImEO37J
-3zgAoImjy0DQTneMNMp3saPUc+NwONYH
-=kDa/
------END PGP SIGNATURE-----

libvirt-1.2.16.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:419bee553442024b9ee8a1fa94023b1189bb52b7c3021fa37d8e4c108490060d
+size 29157627

libvirt-1.2.16.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlVrxCsACgkQRga4pd6VvB9/SACfTRAvdCSH06+3RROrlKSNz7+P
+2mgAnjcvia90gZinoVxUER/hA4v/fkND
+=KdhP
+-----END PGP SIGNATURE-----

libvirt-guests-init-script.patch

@@ -1,9 +1,9 @@
 Adjust libvirt-guests init files to conform to SUSE standards
 
-Index: libvirt-1.2.15/tools/libvirt-guests.init.in
+Index: libvirt-1.2.16/tools/libvirt-guests.init.in
 ===================================================================
---- libvirt-1.2.15.orig/tools/libvirt-guests.init.in
+--- libvirt-1.2.16.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.2.15/tools/libvirt-guests.init.in
++++ libvirt-1.2.16/tools/libvirt-guests.init.in
 @@ -3,15 +3,15 @@
  # the following is the LSB init header
  #
@@ -28,10 +28,10 @@ Index: libvirt-1.2.15/tools/libvirt-guests.init.in
  ### END INIT INFO
  
  # the following is chkconfig init header
-Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.16/tools/libvirt-guests.sh.in
 ===================================================================
---- libvirt-1.2.15.orig/tools/libvirt-guests.sh.in
+--- libvirt-1.2.16.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.2.15/tools/libvirt-guests.sh.in
++++ libvirt-1.2.16/tools/libvirt-guests.sh.in
 @@ -16,14 +16,13 @@
  # License along with this library.  If not, see
  # <http://www.gnu.org/licenses/>.
@@ -50,7 +50,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
  # Source gettext library.
  # Make sure this file is recognized as having translations: _("dummy")
  . "@bindir@"/gettext.sh
-@@ -44,9 +43,11 @@ test -f "$sysconfdir"/sysconfig/libvirt-
+@@ -45,9 +44,11 @@ test -f "$sysconfdir"/sysconfig/libvirt-
      . "$sysconfdir"/sysconfig/libvirt-guests
  
  LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
@@ -65,7 +65,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
  
  # retval COMMAND ARGUMENTS...
  # run command with arguments and convert non-zero return value to 1 and set
-@@ -54,7 +55,7 @@ RETVAL=0
+@@ -55,7 +56,7 @@ RETVAL=0
  retval() {
      "$@"
      if [ $? -ne 0 ]; then
@@ -74,7 +74,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
          return 1
      else
          return 0
-@@ -83,6 +84,26 @@ run_virsh_c() {
+@@ -84,6 +85,26 @@ run_virsh_c() {
      ( export LC_ALL=C; run_virsh "$@" )
  }
  
@@ -101,7 +101,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
  # test_connect URI
  # check if URI is reachable
  test_connect()
-@@ -116,7 +137,7 @@ list_guests() {
+@@ -117,7 +138,7 @@ list_guests() {
  
      list=$(run_virsh_c "$uri" list --uuid $persistent)
      if [ $? -ne 0 ]; then
@@ -110,7 +110,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
          return 1
      fi
  
-@@ -142,7 +163,7 @@ guest_is_on() {
+@@ -143,7 +164,7 @@ guest_is_on() {
      guest_running=false
      id=$(run_virsh "$uri" domid "$uuid")
      if [ $? -ne 0 ]; then
@@ -119,7 +119,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
          return 1
      fi
  
-@@ -192,6 +213,13 @@ start() {
+@@ -193,6 +214,13 @@ start() {
  
          test_connect "$uri" || continue
  
@@ -133,7 +133,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
          eval_gettext "Resuming guests on \$uri URI..."; echo
          for guest in $list; do
              name=$(guest_name "$uri" "$guest")
-@@ -408,7 +436,7 @@ shutdown_guests_parallel()
+@@ -409,7 +437,7 @@ shutdown_guests_parallel()
              timeout=$(($timeout - 1))
              if [ $timeout -le 0 ]; then
                  eval_gettext "Timeout expired while shutting down domains"; echo
@@ -142,7 +142,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
                  return
              fi
          else
-@@ -436,7 +464,7 @@ stop() {
+@@ -437,7 +465,7 @@ stop() {
          if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then
              gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0"
              echo
@@ -151,7 +151,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
              return
          fi
      fi
-@@ -484,14 +512,14 @@ stop() {
+@@ -485,14 +513,14 @@ stop() {
                  if [ $? -ne 0 ]; then
                      eval_gettext "Failed to list persistent guests on \$uri"
                      echo
@@ -168,7 +168,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
                  set +f
                  return
              fi
-@@ -550,14 +578,13 @@ gueststatus() {
+@@ -551,14 +579,13 @@ gueststatus() {
  rh_status() {
      if [ -f "$LISTFILE" ]; then
          gettext "stopped, with saved guests"; echo
@@ -185,16 +185,16 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
          fi
      fi
  }
-@@ -602,4 +629,4 @@ case "$1" in
+@@ -603,4 +630,4 @@ case "$1" in
          usage
          ;;
  esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-1.2.15/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.16/tools/libvirt-guests.sysconf
 ===================================================================
---- libvirt-1.2.15.orig/tools/libvirt-guests.sysconf
+--- libvirt-1.2.16.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.2.15/tools/libvirt-guests.sysconf
++++ libvirt-1.2.16/tools/libvirt-guests.sysconf
 @@ -1,19 +1,29 @@
 +## Path: System/Virtualization/libvirt-guests
 +

libvirt-power8-models.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/src/cpu/cpu_map.xml
+Index: libvirt-1.2.16/src/cpu/cpu_map.xml
 ===================================================================
---- libvirt-1.2.15.orig/src/cpu/cpu_map.xml
+--- libvirt-1.2.16.orig/src/cpu/cpu_map.xml
-+++ libvirt-1.2.15/src/cpu/cpu_map.xml
++++ libvirt-1.2.16/src/cpu/cpu_map.xml
 @@ -668,6 +668,16 @@
        <pvr value='0x004d0000'/>
      </model>

libvirt-suse-netcontrol.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/configure.ac
+Index: libvirt-1.2.16/configure.ac
 ===================================================================
---- libvirt-1.2.15.orig/configure.ac
+--- libvirt-1.2.16.orig/configure.ac
-+++ libvirt-1.2.15/configure.ac
++++ libvirt-1.2.16/configure.ac
 @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
  LIBVIRT_CHECK_GLUSTER
  LIBVIRT_CHECK_HAL
@@ -34,10 +34,10 @@ Index: libvirt-1.2.15/configure.ac
  LIBVIRT_RESULT_NUMACTL
  LIBVIRT_RESULT_OPENWSMAN
  LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-1.2.15/src/Makefile.am
+Index: libvirt-1.2.16/src/Makefile.am
 ===================================================================
---- libvirt-1.2.15.orig/src/Makefile.am
+--- libvirt-1.2.16.orig/src/Makefile.am
-+++ libvirt-1.2.15/src/Makefile.am
++++ libvirt-1.2.16/src/Makefile.am
 @@ -848,6 +848,10 @@ if WITH_NETCF
  INTERFACE_DRIVER_SOURCES +=					\
  		interface/interface_backend_netcf.c
@@ -49,7 +49,7 @@ Index: libvirt-1.2.15/src/Makefile.am
  if WITH_UDEV
  INTERFACE_DRIVER_SOURCES +=					\
  		interface/interface_backend_udev.c
-@@ -1464,6 +1468,10 @@ if WITH_NETCF
+@@ -1466,6 +1470,10 @@ if WITH_NETCF
  libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
  libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
  endif WITH_NETCF
@@ -60,10 +60,10 @@ Index: libvirt-1.2.15/src/Makefile.am
  if WITH_UDEV
  libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
  libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
-Index: libvirt-1.2.15/tools/virsh.c
+Index: libvirt-1.2.16/tools/virsh.c
 ===================================================================
---- libvirt-1.2.15.orig/tools/virsh.c
+--- libvirt-1.2.16.orig/tools/virsh.c
-+++ libvirt-1.2.15/tools/virsh.c
++++ libvirt-1.2.16/tools/virsh.c
 @@ -3327,6 +3327,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
      vshPrint(ctl, " Interface");
  # if defined(WITH_NETCF)
@@ -73,10 +73,10 @@ Index: libvirt-1.2.15/tools/virsh.c
  # elif defined(WITH_UDEV)
      vshPrint(ctl, " udev");
  # endif
-Index: libvirt-1.2.15/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.16/src/interface/interface_backend_netcf.c
 ===================================================================
---- libvirt-1.2.15.orig/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.16.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.2.15/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.16/src/interface/interface_backend_netcf.c
 @@ -23,7 +23,12 @@
  
  #include <config.h>
@@ -160,10 +160,10 @@ Index: libvirt-1.2.15/src/interface/interface_backend_netcf.c
      if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
          return -1;
      if (virRegisterStateDriver(&interfaceStateDriver) < 0)
-Index: libvirt-1.2.15/src/interface/interface_driver.c
+Index: libvirt-1.2.16/src/interface/interface_driver.c
 ===================================================================
---- libvirt-1.2.15.orig/src/interface/interface_driver.c
+--- libvirt-1.2.16.orig/src/interface/interface_driver.c
-+++ libvirt-1.2.15/src/interface/interface_driver.c
++++ libvirt-1.2.16/src/interface/interface_driver.c
 @@ -30,8 +30,15 @@ interfaceRegister(void)
      if (netcfIfaceRegister() == 0)
          return 0;
@@ -181,10 +181,10 @@ Index: libvirt-1.2.15/src/interface/interface_driver.c
      if (udevIfaceRegister() == 0)
          return 0;
  #endif /* WITH_UDEV */
-Index: libvirt-1.2.15/m4/virt-netcontrol.m4
+Index: libvirt-1.2.16/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-1.2.15/m4/virt-netcontrol.m4
++++ libvirt-1.2.16/m4/virt-netcontrol.m4
 @@ -0,0 +1,35 @@
 +dnl The libnetcontrol library
 +dnl

libvirt.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Jun  3 11:29:32 MDT 2015 - jfehlig@suse.com
+
+- Remove unsupported settings in libvirtd.socket unit file when
+  systemd version < 214
+  libvirtd-systemd-socket.patch
+  bsc#933043
+- spec: always apply Apparmor and netcontrol patches
+
+-------------------------------------------------------------------
+Tue Jun  2 09:27:22 MDT 2015 - jfehlig@suse.com
+
+- spec: Add libvirtd.socket unit file to service_add_pre and
+  service_del_postun macros
+
+-------------------------------------------------------------------
+Mon Jun  1 09:31:11 MDT 2015 - jfehlig@suse.com
+
+- Update to libvirt 1.2.16
+  - Introduce pci-serial
+  - Introduce virDomainSetUserPassword API
+  - Introduce protected key mgmt ops
+  - Add domain vmport feature
+  - Many incremental improvements and bug fixes, see
+    http://libvirt.org/news.html
+  - Drop upstream patches c0d3f608-libxl-soundhw.patch and
+    8910e063-arch-caps.patch
+  - Drop polkit-10-virt.rules in favor of upstream 50-libvirt.rules
+
 -------------------------------------------------------------------
 Wed May 20 08:29:00 UTC 2015 - dmacvicar@suse.de
 

libvirt.spec

@@ -240,7 +240,7 @@
 
 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        1.2.15
+Version:        1.2.16
 Release:        0
 Summary:        Library providing a simple virtualization API
 License:        LGPL-2.1+
@@ -297,6 +297,7 @@ BuildRequires:  libtool
 BuildRequires:  modutils
 %if %{with_systemd}
 BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
 %endif
 %if %{with_systemd_daemon}
 BuildRequires:  systemd-devel
@@ -436,16 +437,15 @@ BuildRequires:  numad
 BuildRequires:  wireshark-devel
 %endif
 
+%global systemd_version %(pkg-config --modversion systemd)
+
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source3:        libvirtd.init
 Source4:        libvirtd-relocation-server.fw
-Source5:        polkit-10-virt.rules
 Source99:       baselibs.conf
 # Upstream patches
-Patch0:         c0d3f608-libxl-soundhw.patch
-Patch1:         8910e063-arch-caps.patch
 # Patches pending upstream review
 # Need to go upstream
 Patch150:       xen-pv-cdrom.patch
@@ -463,12 +463,13 @@ Patch205:       support-managed-pci-xen-driver.patch
 Patch206:       systemd-service-xen.patch
 # Disable failing virCgroupGetPercpuStats unit test
 Patch207:       disable-virCgroupGetPercpuStats-test.patch
-%if %{with_apparmor}
+Patch208:       apparmor-no-mount.patch
-Patch250:       apparmor-no-mount.patch
+Patch209:       qemu-apparmor-screenshot.patch
-Patch251:       qemu-apparmor-screenshot.patch
+Patch210:       libvirt-suse-netcontrol.patch
-%endif
+# SocketUser and SocketGroup settings were added to systemd.socket in
-%if %{with_netcontrol}
+# version 214.  Patch the setting away in earlier systemd
-Patch300:       libvirt-suse-netcontrol.patch
+%if 0%{systemd_version} < 214
+Patch300:       libvirtd-systemd-socket.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -975,8 +976,6 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 %patch150 -p1
 %patch151 -p1
 %patch152 -p1
@@ -990,11 +989,10 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
 %patch205 -p1
 %patch206 -p1
 %patch207 -p1
-%if %{with_apparmor}
+%patch208 -p1
-%patch250 -p1
+%patch209 -p1
-%patch251 -p1
+%patch210 -p1
-%endif
+%if 0%{systemd_version} < 214
-%if %{with_netcontrol}
 %patch300 -p1
 %endif
 
@@ -1304,7 +1302,8 @@ of managing Xen.
 EOF
 %endif
 %if ! %{with_libxl}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
 %endif
@@ -1350,10 +1349,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 ln -s %{_sysconfdir}/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests
 %endif
 mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirt-guests $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
-%if %{with_polkit_rules}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/rules.d/
-install %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/rules.d/10-virt.rules
-%endif
 %fdupes -s $RPM_BUILD_ROOT
 
 %clean
@@ -1395,7 +1390,7 @@ fi
 
 %pre daemon
     %if %{with_systemd}
-%service_add_pre libvirtd.service
+%service_add_pre libvirtd.service libvirtd.socket
 %service_add_pre virtlockd.service virtlockd.socket
     %endif
 %{_bindir}/getent group libvirt >/dev/null || \
@@ -1422,7 +1417,7 @@ fi
 %postun daemon
 /sbin/ldconfig
     %if %{with_systemd}
-%service_del_postun libvirtd.service
+%service_del_postun libvirtd.service libvirtd.socket
 %service_del_postun virtlockd.service virtlockd.socket
     %else
 %restart_on_update libvirtd
@@ -1519,7 +1514,7 @@ fi
 %attr(0755, root, root) %{_libdir}/%{name}/lock-driver/lockd.so
     %if %{with_polkit}
         %if %{with_polkit_rules}
-%{_sysconfdir}/polkit-1/rules.d/10-virt.rules
+%{_datadir}/polkit-1/rules.d/50-libvirt.rules
         %endif
         %if 0%{?suse_version} > 1110
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
@@ -1585,6 +1580,7 @@ fi
         %endif
         %if %{with_libxl}
 %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
@@ -1725,6 +1721,7 @@ fi
 %files daemon-driver-libxl
 %defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
 %{_datadir}/augeas/lenses/libvirtd_libxl.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug

libvirtd-defaults.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/daemon/libvirtd.conf
+Index: libvirt-1.2.16/daemon/libvirtd.conf
 ===================================================================
---- libvirt-1.2.15.orig/daemon/libvirtd.conf
+--- libvirt-1.2.16.orig/daemon/libvirtd.conf
-+++ libvirt-1.2.15/daemon/libvirtd.conf
++++ libvirt-1.2.16/daemon/libvirtd.conf
 @@ -18,8 +18,8 @@
  # It is necessary to setup a CA and issue server certificates before
  # using this capability.
@@ -13,10 +13,10 @@ Index: libvirt-1.2.15/daemon/libvirtd.conf
  
  # Listen for unencrypted TCP connections on the public TCP/IP port.
  # NB, must pass the --listen flag to the libvirtd process for this to
-Index: libvirt-1.2.15/daemon/libvirtd-config.c
+Index: libvirt-1.2.16/daemon/libvirtd-config.c
 ===================================================================
---- libvirt-1.2.15.orig/daemon/libvirtd-config.c
+--- libvirt-1.2.16.orig/daemon/libvirtd-config.c
-+++ libvirt-1.2.15/daemon/libvirtd-config.c
++++ libvirt-1.2.16/daemon/libvirtd-config.c
 @@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT
      if (VIR_ALLOC(data) < 0)
          return NULL;
@@ -26,10 +26,10 @@ Index: libvirt-1.2.15/daemon/libvirtd-config.c
      data->listen_tcp = 0;
  
      if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-1.2.15/daemon/test_libvirtd.aug.in
+Index: libvirt-1.2.16/daemon/test_libvirtd.aug.in
 ===================================================================
---- libvirt-1.2.15.orig/daemon/test_libvirtd.aug.in
+--- libvirt-1.2.16.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-1.2.15/daemon/test_libvirtd.aug.in
++++ libvirt-1.2.16/daemon/test_libvirtd.aug.in
 @@ -2,7 +2,7 @@ module Test_libvirtd =
     ::CONFIG::
  

libvirtd-init-script.patch

@@ -1,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards
 
-Index: libvirt-1.2.15/daemon/libvirtd.sysconf
+Index: libvirt-1.2.16/daemon/libvirtd.sysconf
 ===================================================================
---- libvirt-1.2.15.orig/daemon/libvirtd.sysconf
+--- libvirt-1.2.16.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.2.15/daemon/libvirtd.sysconf
++++ libvirt-1.2.16/daemon/libvirtd.sysconf
 @@ -1,16 +1,25 @@
 +## Path: System/Virtualization/libvirt
 +

libvirtd-systemd-socket.patch

@@ -0,0 +1,28 @@
+Remove unsupported systemd.socket settings
+
+The libvirtd.socket unit file contains SocketUser and SocketGroup
+settings that were introduced in systemd version 214.  Remove the
+setting to prevent unnecessary and confusing journal entries such
+as
+
+  Unknown lvalue 'SocketGroup' in section 'Socket'
+
+See bsc#933043
+
+Index: libvirt-1.2.16/daemon/libvirtd.socket.in
+===================================================================
+--- libvirt-1.2.16.orig/daemon/libvirtd.socket.in
++++ libvirt-1.2.16/daemon/libvirtd.socket.in
+@@ -2,10 +2,8 @@
+ ListenStream=@runstatedir@/libvirt/libvirt-sock
+ ListenStream=@runstatedir@/libvirt/libvirt-sock-ro
+ 
+-; The following settings must match libvirtd.conf file in order to
+-; work as expected because libvirtd can't change them later.
++; The following setting must match libvirtd.conf file in order to
++; work as expected because libvirtd can't change it later.
+ ; SocketMode=0777 is safe only if authentication on the socket is set
+ ; up.  For further information, please see the libvirtd.conf file.
+ SocketMode=0777
+-SocketUser=root
+-SocketGroup=root

polkit-10-virt.rules

@@ -1,8 +0,0 @@
-polkit.addRule(function(action, subject) {
-    if (action.id == "org.libvirt.unix.manage"
-            && subject.local
-            && subject.active
-            && subject.isInGroup("libvirt")) {
-        return polkit.Result.YES;
-    }
-});

ppc64le-canonical-name.patch

@@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
 
 See bnc#894956
 
-Index: libvirt-1.2.15/src/util/virarch.c
+Index: libvirt-1.2.16/src/util/virarch.c
 ===================================================================
---- libvirt-1.2.15.orig/src/util/virarch.c
+--- libvirt-1.2.16.orig/src/util/virarch.c
-+++ libvirt-1.2.15/src/util/virarch.c
++++ libvirt-1.2.16/src/util/virarch.c
 @@ -169,6 +169,8 @@ virArch virArchFromHost(void)
          arch = VIR_ARCH_I686;
      } else if (STREQ(ut.machine, "amd64")) {

qemu-apparmor-screenshot.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.16/examples/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu
+--- libvirt-1.2.16.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.15/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.16/examples/apparmor/libvirt-qemu
 @@ -133,6 +133,9 @@
    /sys/bus/ r,
    /sys/class/ r,

support-managed-pci-xen-driver.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
  src/xenxs/xen_xm.c   |   28 +++++++++++++++++++++++++++-
  2 files changed, 35 insertions(+), 15 deletions(-)
 
-Index: libvirt-1.2.15/src/xenconfig/xen_common.c
+Index: libvirt-1.2.16/src/xenconfig/xen_common.c
 ===================================================================
---- libvirt-1.2.15.orig/src/xenconfig/xen_common.c
+--- libvirt-1.2.16.orig/src/xenconfig/xen_common.c
-+++ libvirt-1.2.15/src/xenconfig/xen_common.c
++++ libvirt-1.2.16/src/xenconfig/xen_common.c
 @@ -403,6 +403,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
  {
      virConfValuePtr list = virConfGetValue(conf, "pci");
@@ -66,10 +66,10 @@ Index: libvirt-1.2.15/src/xenconfig/xen_common.c
              hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
              hostdev->source.subsys.u.pci.addr.domain = domainID;
              hostdev->source.subsys.u.pci.addr.bus = busID;
-Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.16/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.16.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.16/src/xenconfig/xen_sxpr.c
 @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def,
          int busID;
          int slotID;

suse-qemu-conf.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/src/qemu/qemu.conf
+Index: libvirt-1.2.16/src/qemu/qemu.conf
 ===================================================================
---- libvirt-1.2.15.orig/src/qemu/qemu.conf
+--- libvirt-1.2.16.orig/src/qemu/qemu.conf
-+++ libvirt-1.2.15/src/qemu/qemu.conf
++++ libvirt-1.2.16/src/qemu/qemu.conf
 @@ -201,11 +201,20 @@
  # isolation, but it cannot appear in a list of drivers.
  #

systemd-service-xen.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/daemon/libvirtd.service.in
+Index: libvirt-1.2.16/daemon/libvirtd.service.in
 ===================================================================
---- libvirt-1.2.15.orig/daemon/libvirtd.service.in
+--- libvirt-1.2.16.orig/daemon/libvirtd.service.in
-+++ libvirt-1.2.15/daemon/libvirtd.service.in
++++ libvirt-1.2.16/daemon/libvirtd.service.in
 @@ -5,6 +5,8 @@ After=network.target
  After=dbus.service
  After=iscsid.service

virtlockd-init-script.patch

@@ -1,9 +1,9 @@
 Adjust virtlockd init files to conform to SUSE standards
 
-Index: libvirt-1.2.15/src/locking/virtlockd.sysconf
+Index: libvirt-1.2.16/src/locking/virtlockd.sysconf
 ===================================================================
---- libvirt-1.2.15.orig/src/locking/virtlockd.sysconf
+--- libvirt-1.2.16.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.2.15/src/locking/virtlockd.sysconf
++++ libvirt-1.2.16/src/locking/virtlockd.sysconf
 @@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +
@@ -12,10 +12,10 @@ Index: libvirt-1.2.15/src/locking/virtlockd.sysconf
  #
  # Pass extra arguments to virtlockd
  #VIRTLOCKD_ARGS=
-Index: libvirt-1.2.15/src/locking/virtlockd.init.in
+Index: libvirt-1.2.16/src/locking/virtlockd.init.in
 ===================================================================
---- libvirt-1.2.15.orig/src/locking/virtlockd.init.in
+--- libvirt-1.2.16.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.2.15/src/locking/virtlockd.init.in
++++ libvirt-1.2.16/src/locking/virtlockd.init.in
 @@ -4,12 +4,14 @@
  # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
  #

xen-pv-cdrom.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.16/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.16.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.16/src/xenconfig/xen_sxpr.c
 @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value,
  static int
  xenParseSxprDisks(virDomainDefPtr def,