diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index d1f254c..76398a7 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.4.0/examples/apparmor/libvirt-qemu +Index: libvirt-2.5.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-2.4.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-2.4.0/examples/apparmor/libvirt-qemu +--- libvirt-2.5.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-2.5.0/examples/apparmor/libvirt-qemu @@ -143,6 +143,9 @@ # for restore /bin/bash rmix, diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index 3677521..5126287 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.4.0/examples/apparmor/libvirt-lxc +Index: libvirt-2.5.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-2.4.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-2.4.0/examples/apparmor/libvirt-lxc +--- libvirt-2.5.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-2.5.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch index 750cae9..4dca0cf 100644 --- a/blockcopy-check-dst-identical-device.patch +++ b/blockcopy-check-dst-identical-device.patch @@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-2.4.0/src/qemu/qemu_driver.c +Index: libvirt-2.5.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-2.4.0.orig/src/qemu/qemu_driver.c -+++ libvirt-2.4.0/src/qemu/qemu_driver.c -@@ -16650,6 +16650,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-2.5.0.orig/src/qemu/qemu_driver.c ++++ libvirt-2.5.0/src/qemu/qemu_driver.c +@@ -16680,6 +16680,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } diff --git a/libvirt-2.4.0.tar.xz b/libvirt-2.4.0.tar.xz deleted file mode 100644 index a6251a2..0000000 --- a/libvirt-2.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b727c5f43ed3d7337ec2c2f2031ebd4207507978f68d00ad13d4f0f84aad6224 -size 13237652 diff --git a/libvirt-2.4.0.tar.xz.asc b/libvirt-2.4.0.tar.xz.asc deleted file mode 100644 index 970e67c..0000000 --- a/libvirt-2.4.0.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iEYEABECAAYFAlgY/h8ACgkQRga4pd6VvB/frACfe7j1WXBSmST4QBhZcn3tqMKC -/6oAnjEquHVIMalD/Z5KmZHIeJ8qfsCp -=y5ZG ------END PGP SIGNATURE----- diff --git a/libvirt-2.5.0.tar.xz b/libvirt-2.5.0.tar.xz new file mode 100644 index 0000000..24bf7d7 --- /dev/null +++ b/libvirt-2.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:819dffefbfd6ae95dfe1b28cfdee15ebcf9f91bbd732157488a57705bf81cb1e +size 13638636 diff --git a/libvirt-2.5.0.tar.xz.asc b/libvirt-2.5.0.tar.xz.asc new file mode 100644 index 0000000..df175c1 --- /dev/null +++ b/libvirt-2.5.0.tar.xz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABAgAGBQJYRIafAAoJEBVYiyZZa+pdCEkIAMzxa5BHPXFnolPlD06kNRBl +aqiLDiFb9uYMAdg87pNiHMzwjhby9iH8HORflxGpW7MLSNS/Q3U66WFt6EUefzv1 +PRLfR+9rkdGmwrDBoj8HA/EeDaC3OR5j0XdAYn6KXFTTWlOo5IgC+3idq6iIxXYP +wco3HKo+gm863U5O2a+EPsWqSj0jopjU9wj9c1uCR8t1Ezhz+iI8qk3GWoozMzBI +s6Z5a7KmUKZAHUDy+vD1UAOATy2+8kEJ57hAeaaj5WPEC6x1l3u6MDQRmZ+wM7C9 +PV5VUvDDzm9mCakmhIL8/2iPlLip6Qk2HXVjObimiqGO5xQvWlD0ivuZrfClkpM= +=lyBB +-----END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index 34e525d..d9a16b9 100644 --- a/libvirt-guests-init-script.patch +++ b/libvirt-guests-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-2.4.0/tools/libvirt-guests.init.in +Index: libvirt-2.5.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-2.4.0.orig/tools/libvirt-guests.init.in -+++ libvirt-2.4.0/tools/libvirt-guests.init.in +--- libvirt-2.5.0.orig/tools/libvirt-guests.init.in ++++ libvirt-2.5.0/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -45,10 +45,10 @@ Index: libvirt-2.4.0/tools/libvirt-guests.init.in # exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-2.4.0/tools/libvirt-guests.sh.in +Index: libvirt-2.5.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-2.4.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-2.4.0/tools/libvirt-guests.sh.in +--- libvirt-2.5.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-2.5.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -208,10 +208,10 @@ Index: libvirt-2.4.0/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-2.4.0/tools/libvirt-guests.sysconf +Index: libvirt-2.5.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-2.4.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-2.4.0/tools/libvirt-guests.sysconf +--- libvirt-2.5.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-2.5.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index e5077ab..805461a 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -2,36 +2,16 @@ Add POWER8 v2.0 and v2.1 to cpu map XML From: -Index: libvirt-2.4.0/src/cpu/cpu_map.xml +Index: libvirt-2.5.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-2.4.0.orig/src/cpu/cpu_map.xml -+++ libvirt-2.4.0/src/cpu/cpu_map.xml -@@ -1542,6 +1542,16 @@ +--- libvirt-2.5.0.orig/src/cpu/cpu_map.xml ++++ libvirt-2.5.0/src/cpu/cpu_map.xml +@@ -1540,6 +1540,8 @@ + + ++ ++ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -Index: libvirt-2.4.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml -=================================================================== ---- libvirt-2.4.0.orig/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml -+++ libvirt-2.4.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml -@@ -26,6 +26,7 @@ - - POWER8 - POWER7 -+ POWER8_v2.0 - - - diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index fd6a8dc..ac748ca 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,16 +1,16 @@ -Index: libvirt-2.4.0/configure.ac +Index: libvirt-2.5.0/configure.ac =================================================================== ---- libvirt-2.4.0.orig/configure.ac -+++ libvirt-2.4.0/configure.ac -@@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE - LIBVIRT_CHECK_GLUSTER +--- libvirt-2.5.0.orig/configure.ac ++++ libvirt-2.5.0/configure.ac +@@ -251,6 +251,7 @@ LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL + LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_NETCF +LIBVIRT_CHECK_NETCONTROL LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2404,11 +2405,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2287,11 +2288,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,19 +26,19 @@ Index: libvirt-2.4.0/configure.ac esac if test "$with_interface" = "yes" ; then -@@ -2787,6 +2789,7 @@ LIBVIRT_RESULT_FUSE - LIBVIRT_RESULT_GLUSTER +@@ -2680,6 +2682,7 @@ LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL + LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_NETCF +LIBVIRT_RESULT_NETCONTROL LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-2.4.0/src/Makefile.am +Index: libvirt-2.5.0/src/Makefile.am =================================================================== ---- libvirt-2.4.0.orig/src/Makefile.am -+++ libvirt-2.4.0/src/Makefile.am -@@ -952,6 +952,10 @@ if WITH_NETCF +--- libvirt-2.5.0.orig/src/Makefile.am ++++ libvirt-2.5.0/src/Makefile.am +@@ -954,6 +954,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ Index: libvirt-2.4.0/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1600,6 +1604,10 @@ if WITH_NETCF +@@ -1603,6 +1607,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-2.4.0/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-2.4.0/tools/virsh.c +Index: libvirt-2.5.0/tools/virsh.c =================================================================== ---- libvirt-2.4.0.orig/tools/virsh.c -+++ libvirt-2.4.0/tools/virsh.c +--- libvirt-2.5.0.orig/tools/virsh.c ++++ libvirt-2.5.0/tools/virsh.c @@ -602,6 +602,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -73,10 +73,10 @@ Index: libvirt-2.4.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-2.4.0/src/interface/interface_backend_netcf.c +Index: libvirt-2.5.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-2.4.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-2.4.0/src/interface/interface_backend_netcf.c +--- libvirt-2.5.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-2.5.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -160,10 +160,10 @@ Index: libvirt-2.4.0/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-2.4.0/src/interface/interface_driver.c +Index: libvirt-2.5.0/src/interface/interface_driver.c =================================================================== ---- libvirt-2.4.0.orig/src/interface/interface_driver.c -+++ libvirt-2.4.0/src/interface/interface_driver.c +--- libvirt-2.5.0.orig/src/interface/interface_driver.c ++++ libvirt-2.5.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ Index: libvirt-2.4.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-2.4.0/m4/virt-netcontrol.m4 +Index: libvirt-2.5.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-2.4.0/m4/virt-netcontrol.m4 ++++ libvirt-2.5.0/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index 05a3006..17b4c10 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 5 02:12:56 UTC 2016 - jfehlig@suse.com + +- Update to libvirt 2.5.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html +- Import new public signing key + ------------------------------------------------------------------- Wed Nov 16 18:13:18 UTC 2016 - jfehlig@suse.com diff --git a/libvirt.keyring b/libvirt.keyring index cf6c345..d099f8f 100644 --- a/libvirt.keyring +++ b/libvirt.keyring @@ -1,3 +1,106 @@ +user: "Daniel Veillard (Red Hat work email) " + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +fhTU6jmxaa6p39kPq3Q= +=cqkL +-----END PGP PUBLIC KEY BLOCK----- + user: "Daniel Veillard (Red Hat work email) " 1024-bit DSA key, ID DE95BC1F, created 2000-05-31 diff --git a/libvirt.spec b/libvirt.spec index 39eb39e..63c0137 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -57,6 +57,7 @@ %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} %define with_wireshark 0%{!?_without_wireshark:0} +%define with_libssh 0%{!?_without_libssh:0} # Xen no longer contains xm/xend so disable building the legacy Xen driver %define with_xen 0 @@ -174,7 +175,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 2.4.0 +Version: 2.5.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -300,6 +301,9 @@ BuildRequires: numad %if %{with_wireshark} BuildRequires: wireshark-devel >= 1.12.1 %endif +%if %{with_libssh} +BuildRequires: libssh-devel >= 0.7.0 +%endif Source0: %{name}-%{version}.tar.xz Source1: %{name}-%{version}.tar.xz.asc @@ -980,13 +984,14 @@ export CFLAGS="$RPM_OPT_FLAGS" ac_cv_path_MODPROBE=/sbin/modprobe \ ac_cv_path_UDEVADM=/sbin/udevadm \ ac_cv_path_SHOWMOUNT=/usr/sbin/showmount \ + ac_cv_path_PARTED=/usr/sbin/parted \ ac_cv_path_QEMU_BRIDGE_HELPER=/usr/lib/qemu-bridge-helper -make V=1 %{?jobs:-j%jobs} DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name} +make V=1 %{?jobs:-j%jobs} HTML_DIR=%{_docdir}/%{name} gzip -9 ChangeLog %install -%makeinstall SYSTEMD_UNIT_DIR=%{_unitdir} DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name} -make -C examples distclean +%makeinstall SYSTEMD_UNIT_DIR=%{_unitdir} HTML_DIR=%{_docdir}/%{name} +make %{?jobs:-j%jobs} -C examples distclean cp examples/lxcconvert/virt-lxc-convert $RPM_BUILD_ROOT%{_bindir} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %if %{with_wireshark} @@ -1005,8 +1010,8 @@ do rm -rfv "$dir" done -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/hooks +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/hooks %find_lang %{name} # Add a README to the libvirt package with a note about the empty # file list @@ -1104,8 +1109,8 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/virtlogd $RPM_BUILD_ROOT%{_localstate mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/virtlockd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd #install firewall definitions format is described here: #/usr/share/SuSEfirewall2/services/TEMPLATE -mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} -install -m 644 %{S:4} $RPM_BUILD_ROOT/%{_fwdefdir}/libvirtd-relocation-server +mkdir -p $RPM_BUILD_ROOT%{_fwdefdir} +install -m 644 %{S:4} $RPM_BUILD_ROOT%{_fwdefdir}/libvirtd-relocation-server %if %{with_systemd} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests @@ -1141,9 +1146,9 @@ do rm -f $i printf 'int main(void) { return 0; }' > $i.c done -make +make %{?jobs:-j%jobs} -if ! make check VIR_TEST_DEBUG=1 +if ! make %{?jobs:-j%jobs} check VIR_TEST_DEBUG=1 then cat test-suite.log || true exit 1 @@ -1296,6 +1301,7 @@ fi %{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd %if %{with_systemd} %{_unitdir}/libvirtd.service +%{_unitdir}/virt-guest-shutdown.target %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket %{_unitdir}/virtlockd.service @@ -1542,7 +1548,6 @@ fi %{_datadir}/libvirt/schemas/storagepool.rng %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/cpu_map.xml -%{_datadir}/libvirt/libvirtLogo.png %dir %{_sysconfdir}/sasl2/ %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf @@ -1576,6 +1581,7 @@ fi %doc %{_docdir}/%{name}/*.css %doc %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/internals +%doc %{_docdir}/%{name}/logos # API docs %dir %{_datadir}/gtk-doc/html/libvirt/ diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index f751d69..690320d 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.4.0/daemon/libvirtd.conf +Index: libvirt-2.5.0/daemon/libvirtd.conf =================================================================== ---- libvirt-2.4.0.orig/daemon/libvirtd.conf -+++ libvirt-2.4.0/daemon/libvirtd.conf +--- libvirt-2.5.0.orig/daemon/libvirtd.conf ++++ libvirt-2.5.0/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-2.4.0/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-2.4.0/daemon/libvirtd-config.c +Index: libvirt-2.5.0/daemon/libvirtd-config.c =================================================================== ---- libvirt-2.4.0.orig/daemon/libvirtd-config.c -+++ libvirt-2.4.0/daemon/libvirtd-config.c +--- libvirt-2.5.0.orig/daemon/libvirtd-config.c ++++ libvirt-2.5.0/daemon/libvirtd-config.c @@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ Index: libvirt-2.4.0/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-2.4.0/daemon/test_libvirtd.aug.in +Index: libvirt-2.5.0/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-2.4.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-2.4.0/daemon/test_libvirtd.aug.in +--- libvirt-2.5.0.orig/daemon/test_libvirtd.aug.in ++++ libvirt-2.5.0/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: diff --git a/libvirtd-init-script.patch b/libvirtd-init-script.patch index f3eea40..9d5f09e 100644 --- a/libvirtd-init-script.patch +++ b/libvirtd-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-2.4.0/daemon/libvirtd.sysconf +Index: libvirt-2.5.0/daemon/libvirtd.sysconf =================================================================== ---- libvirt-2.4.0.orig/daemon/libvirtd.sysconf -+++ libvirt-2.4.0/daemon/libvirtd.sysconf +--- libvirt-2.5.0.orig/daemon/libvirtd.sysconf ++++ libvirt-2.5.0/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index 7b01c0b..43c3a96 100644 --- a/libxl-dom-reset.patch +++ b/libxl-dom-reset.patch @@ -8,10 +8,10 @@ Date: Mon Jun 23 15:51:20 2014 -0600 option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-2.4.0/src/libxl/libxl_driver.c +Index: libvirt-2.5.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-2.4.0.orig/src/libxl/libxl_driver.c -+++ libvirt-2.4.0/src/libxl/libxl_driver.c +--- libvirt-2.5.0.orig/src/libxl/libxl_driver.c ++++ libvirt-2.5.0/src/libxl/libxl_driver.c @@ -1384,6 +1384,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } @@ -74,7 +74,7 @@ Index: libvirt-2.4.0/src/libxl/libxl_driver.c libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6426,6 +6481,7 @@ static virHypervisorDriver libxlHypervis +@@ -6429,6 +6484,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ diff --git a/libxl-qemu-emulator-caps.patch b/libxl-qemu-emulator-caps.patch index d3656d9..9647d85 100644 --- a/libxl-qemu-emulator-caps.patch +++ b/libxl-qemu-emulator-caps.patch @@ -8,10 +8,10 @@ as the default , instead of the qemu-xen one. See FATE#320638 for details. -Index: libvirt-2.4.0/src/libxl/libxl_capabilities.c +Index: libvirt-2.5.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-2.4.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-2.4.0/src/libxl/libxl_capabilities.c +--- libvirt-2.5.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-2.5.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index 360bf5f..52f133f 100644 --- a/libxl-set-cach-mode.patch +++ b/libxl-set-cach-mode.patch @@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425 src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-2.4.0/src/libxl/libxl_conf.c +Index: libvirt-2.5.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-2.4.0.orig/src/libxl/libxl_conf.c -+++ libvirt-2.4.0/src/libxl/libxl_conf.c +--- libvirt-2.5.0.orig/src/libxl/libxl_conf.c ++++ libvirt-2.5.0/src/libxl/libxl_conf.c @@ -584,6 +584,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index 61ad0fa..9c67649 100644 --- a/libxl-set-migration-constraints.patch +++ b/libxl-set-migration-constraints.patch @@ -16,11 +16,11 @@ Signed-off-by: Jim Fehlig tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-2.4.0/include/libvirt/libvirt-domain.h +Index: libvirt-2.5.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-2.4.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-2.4.0/include/libvirt/libvirt-domain.h -@@ -889,6 +889,31 @@ typedef enum { +--- libvirt-2.5.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-2.5.0/include/libvirt/libvirt-domain.h +@@ -1000,6 +1000,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,11 +52,11 @@ Index: libvirt-2.4.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-2.4.0/src/libxl/libxl_driver.c +Index: libvirt-2.5.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-2.4.0.orig/src/libxl/libxl_driver.c -+++ libvirt-2.4.0/src/libxl/libxl_driver.c -@@ -6044,6 +6044,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-2.5.0.orig/src/libxl/libxl_driver.c ++++ libvirt-2.5.0/src/libxl/libxl_driver.c +@@ -6047,6 +6047,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -66,7 +66,7 @@ Index: libvirt-2.4.0/src/libxl/libxl_driver.c #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6060,6 +6063,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6063,6 +6066,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -85,7 +85,7 @@ Index: libvirt-2.4.0/src/libxl/libxl_driver.c virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6074,11 +6089,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6077,11 +6092,11 @@ libxlDomainMigratePerform3Params(virDoma if (flags & VIR_MIGRATE_PEER2PEER) { if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, @@ -99,10 +99,10 @@ Index: libvirt-2.4.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-2.4.0/src/libxl/libxl_migration.c +Index: libvirt-2.5.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-2.4.0.orig/src/libxl/libxl_migration.c -+++ libvirt-2.4.0/src/libxl/libxl_migration.c +--- libvirt-2.5.0.orig/src/libxl/libxl_migration.c ++++ libvirt-2.5.0/src/libxl/libxl_migration.c @@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, @@ -217,10 +217,10 @@ Index: libvirt-2.4.0/src/libxl/libxl_migration.c virObjectLock(vm); cleanup: -Index: libvirt-2.4.0/src/libxl/libxl_migration.h +Index: libvirt-2.5.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-2.4.0.orig/src/libxl/libxl_migration.h -+++ libvirt-2.4.0/src/libxl/libxl_migration.h +--- libvirt-2.5.0.orig/src/libxl/libxl_migration.h ++++ libvirt-2.5.0/src/libxl/libxl_migration.h @@ -38,6 +38,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -265,13 +265,13 @@ Index: libvirt-2.4.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, -Index: libvirt-2.4.0/tools/virsh-domain.c +Index: libvirt-2.5.0/tools/virsh-domain.c =================================================================== ---- libvirt-2.4.0.orig/tools/virsh-domain.c -+++ libvirt-2.4.0/tools/virsh-domain.c -@@ -10104,6 +10104,22 @@ static const vshCmdOptDef opts_migrate[] - .type = VSH_OT_INT, - .help = N_("CPU throttling rate increment for auto-convergence") +--- libvirt-2.5.0.orig/tools/virsh-domain.c ++++ libvirt-2.5.0/tools/virsh-domain.c +@@ -10109,6 +10109,22 @@ static const vshCmdOptDef opts_migrate[] + .type = VSH_OT_STRING, + .help = N_("filename containing updated persistent XML for the target") }, + {.name = "max_iters", + .type = VSH_OT_INT, @@ -292,7 +292,7 @@ Index: libvirt-2.4.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10127,6 +10143,7 @@ doMigrate(void *opaque) +@@ -10132,6 +10148,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -300,7 +300,7 @@ Index: libvirt-2.4.0/tools/virsh-domain.c sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10246,6 +10263,27 @@ doMigrate(void *opaque) +@@ -10251,6 +10268,27 @@ doMigrate(void *opaque) goto save_error; } @@ -328,11 +328,11 @@ Index: libvirt-2.4.0/tools/virsh-domain.c if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-2.4.0/tools/virsh.pod +Index: libvirt-2.5.0/tools/virsh.pod =================================================================== ---- libvirt-2.4.0.orig/tools/virsh.pod -+++ libvirt-2.4.0/tools/virsh.pod -@@ -1699,6 +1699,14 @@ compression. I<--comp-mt-threads> and I< +--- libvirt-2.5.0.orig/tools/virsh.pod ++++ libvirt-2.5.0/tools/virsh.pod +@@ -1706,6 +1706,14 @@ compression. I<--comp-mt-threads> and I< of compress threads on source and the number of decompress threads on target respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes. diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index f972394..e007d18 100644 --- a/libxl-support-block-script.patch +++ b/libxl-support-block-script.patch @@ -7,10 +7,10 @@ and npiv. For more details, see bsc#954872 and FATE#319810 -Index: libvirt-2.4.0/src/libxl/libxl_conf.c +Index: libvirt-2.5.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-2.4.0.orig/src/libxl/libxl_conf.c -+++ libvirt-2.4.0/src/libxl/libxl_conf.c +--- libvirt-2.5.0.orig/src/libxl/libxl_conf.c ++++ libvirt-2.5.0/src/libxl/libxl_conf.c @@ -584,6 +584,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index f40ef77..8c2f4d6 100644 --- a/lxc-wait-after-eth-del.patch +++ b/lxc-wait-after-eth-del.patch @@ -13,10 +13,10 @@ device with the same name that is being created. src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-2.4.0/src/lxc/lxc_controller.c +Index: libvirt-2.5.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-2.4.0.orig/src/lxc/lxc_controller.c -+++ libvirt-2.4.0/src/lxc/lxc_controller.c +--- libvirt-2.5.0.orig/src/lxc/lxc_controller.c ++++ libvirt-2.5.0/src/lxc/lxc_controller.c @@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,11 +25,11 @@ Index: libvirt-2.4.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-2.4.0/src/lxc/lxc_driver.c +Index: libvirt-2.5.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-2.4.0.orig/src/lxc/lxc_driver.c -+++ libvirt-2.4.0/src/lxc/lxc_driver.c -@@ -4031,6 +4031,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +--- libvirt-2.5.0.orig/src/lxc/lxc_driver.c ++++ libvirt-2.5.0/src/lxc/lxc_driver.c +@@ -4034,6 +4034,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -37,7 +37,7 @@ Index: libvirt-2.4.0/src/lxc/lxc_driver.c break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -4465,6 +4466,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4468,6 +4469,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -45,10 +45,10 @@ Index: libvirt-2.4.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-2.4.0/src/lxc/lxc_process.c +Index: libvirt-2.5.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-2.4.0.orig/src/lxc/lxc_process.c -+++ libvirt-2.4.0/src/lxc/lxc_process.c +--- libvirt-2.5.0.orig/src/lxc/lxc_process.c ++++ libvirt-2.5.0/src/lxc/lxc_process.c @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD } networkReleaseActualDevice(vm->def, iface); diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index ab6b53a..c02c4aa 100644 --- a/ppc64le-canonical-name.patch +++ b/ppc64le-canonical-name.patch @@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64 See bnc#894956 -Index: libvirt-2.4.0/src/util/virarch.c +Index: libvirt-2.5.0/src/util/virarch.c =================================================================== ---- libvirt-2.4.0.orig/src/util/virarch.c -+++ libvirt-2.4.0/src/util/virarch.c +--- libvirt-2.5.0.orig/src/util/virarch.c ++++ libvirt-2.5.0/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { diff --git a/qemu-apparmor-screenshot.patch b/qemu-apparmor-screenshot.patch index b7c23c7..a1636be 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.4.0/examples/apparmor/libvirt-qemu +Index: libvirt-2.5.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-2.4.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-2.4.0/examples/apparmor/libvirt-qemu +--- libvirt-2.5.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-2.5.0/examples/apparmor/libvirt-qemu @@ -151,3 +151,6 @@ /etc/udev/udev.conf r, /sys/bus/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 9cbeb79..b358005 100644 --- a/support-managed-pci-xen-driver.patch +++ b/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-2.4.0/src/xenconfig/xen_common.c +Index: libvirt-2.5.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-2.4.0.orig/src/xenconfig/xen_common.c -+++ libvirt-2.4.0/src/xenconfig/xen_common.c +--- libvirt-2.5.0.orig/src/xenconfig/xen_common.c ++++ libvirt-2.5.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-2.4.0/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-2.4.0/src/xenconfig/xen_sxpr.c +Index: libvirt-2.5.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c +--- libvirt-2.5.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-2.5.0/src/xenconfig/xen_sxpr.c @@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 5e0053d..c4a8c33 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -7,10 +7,10 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch, etc.), but for now they are all lumped together in this single patch. -Index: libvirt-2.4.0/src/qemu/qemu.conf +Index: libvirt-2.5.0/src/qemu/qemu.conf =================================================================== ---- libvirt-2.4.0.orig/src/qemu/qemu.conf -+++ libvirt-2.4.0/src/qemu/qemu.conf +--- libvirt-2.5.0.orig/src/qemu/qemu.conf ++++ libvirt-2.5.0/src/qemu/qemu.conf @@ -283,11 +283,20 @@ # isolation, but it cannot appear in a list of drivers. # diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch index c14bc5c..5da9970 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.4.0/daemon/libvirtd.service.in +Index: libvirt-2.5.0/daemon/libvirtd.service.in =================================================================== ---- libvirt-2.4.0.orig/daemon/libvirtd.service.in -+++ libvirt-2.4.0/daemon/libvirtd.service.in +--- libvirt-2.5.0.orig/daemon/libvirtd.service.in ++++ libvirt-2.5.0/daemon/libvirtd.service.in @@ -13,6 +13,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index 4f03f9e..a3adf3d 100644 --- a/virtlockd-init-script.patch +++ b/virtlockd-init-script.patch @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-2.4.0/src/locking/virtlockd.sysconf +Index: libvirt-2.5.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-2.4.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-2.4.0/src/locking/virtlockd.sysconf +--- libvirt-2.5.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-2.5.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-2.4.0/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-2.4.0/src/locking/virtlockd.init.in +Index: libvirt-2.5.0/src/locking/virtlockd.init.in =================================================================== ---- libvirt-2.4.0.orig/src/locking/virtlockd.init.in -+++ libvirt-2.4.0/src/locking/virtlockd.init.in +--- libvirt-2.5.0.orig/src/locking/virtlockd.init.in ++++ libvirt-2.5.0/src/locking/virtlockd.init.in @@ -4,59 +4,57 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # diff --git a/virtlogd-init-script.patch b/virtlogd-init-script.patch index 45cdb0d..2535217 100644 --- a/virtlogd-init-script.patch +++ b/virtlogd-init-script.patch @@ -1,9 +1,9 @@ Adjust virtlogd init files to conform to SUSE standards -Index: libvirt-2.4.0/src/logging/virtlogd.init.in +Index: libvirt-2.5.0/src/logging/virtlogd.init.in =================================================================== ---- libvirt-2.4.0.orig/src/logging/virtlogd.init.in -+++ libvirt-2.4.0/src/logging/virtlogd.init.in +--- libvirt-2.5.0.orig/src/logging/virtlogd.init.in ++++ libvirt-2.5.0/src/logging/virtlogd.init.in @@ -4,59 +4,56 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -126,10 +126,10 @@ Index: libvirt-2.4.0/src/logging/virtlogd.init.in esac -exit $RETVAL +rc_exit -Index: libvirt-2.4.0/src/logging/virtlogd.sysconf +Index: libvirt-2.5.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-2.4.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-2.4.0/src/logging/virtlogd.sysconf +--- libvirt-2.5.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-2.5.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index eaeb2db..91b66bd 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c +Index: libvirt-2.5.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c +--- libvirt-2.5.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-2.5.0/src/xenconfig/xen_sxpr.c @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, diff --git a/xen-sxpr-disk-type.patch b/xen-sxpr-disk-type.patch index 0fc740a..b2f0bb2 100644 --- a/xen-sxpr-disk-type.patch +++ b/xen-sxpr-disk-type.patch @@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c. https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c +Index: libvirt-2.5.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c +--- libvirt-2.5.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-2.5.0/src/xenconfig/xen_sxpr.c @@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */