Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2017-06-20 10:58:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Tue Jun 20 10:58:43 2017 rev:230 rq:503752 version:3.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2017-06-01 16:29:01.582494753 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2017-06-20 10:59:23.544031911 +0200 @@ -1,0 +2,36 @@ +Wed Jun 7 22:07:38 UTC 2017 - [email protected] + +- misc spec file cleanup + - remove checks for old distros well beyond EOL + - enable wireshark dissector for Leap >= 42.2 and Factory + - remove support for old, non-systemd distros + - replace $RPM_ shell vars with modern macros + +------------------------------------------------------------------- +Tue Jun 6 22:01:24 UTC 2017 - [email protected] + +- Don't exceed specified length when reading from stream + 5004f121-virFdStreamThread-dont-exceed-length.patch, + 1a4b21f1-set-EOF-on-end-of-stream.patch + +------------------------------------------------------------------- +Fri Jun 2 17:23:04 UTC 2017 - [email protected] + +- Update to libvirt 3.4.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: + aeda1b8c-qemu-no-error-shutdown.patch, + 8023b21a-conf-ioapic.patch, 6b5c6314-qemu-irqchip.patch, + 2020e2c6-conf-intremap.patch, 04028a9d-qemu-intremap.patch, + d12781b4-conf-iommu-cache-mode-attr.patch, + a5691448-qemu-iommu-cache-mode.patch, + 3a276c65-conf-iommu-def-stability-check.patch, + 935d927a-conf-iommu-ABI-stability-check.patch, + 4cd3f241-fix-NULL-disk-source.patch, + 975ea20f-loopback-macro.patch, + dbb85e0c-libxl-graphics-listen-addr.patch, + libxl-def-usbctrl.patch, revert-2841e675-mtu.patch + - FATE#321335, bsc#1031056, bsc#1037774, bsc#1040207, bsc#1040213 + +------------------------------------------------------------------- Old: ---- 04028a9d-qemu-intremap.patch 2020e2c6-conf-intremap.patch 3a276c65-conf-iommu-def-stability-check.patch 4cd3f241-fix-NULL-disk-source.patch 6b5c6314-qemu-irqchip.patch 8023b21a-conf-ioapic.patch 935d927a-conf-iommu-ABI-stability-check.patch 975ea20f-loopback-macro.patch a5691448-qemu-iommu-cache-mode.patch aeda1b8c-qemu-no-error-shutdown.patch d12781b4-conf-iommu-cache-mode-attr.patch dbb85e0c-libxl-graphics-listen-addr.patch libvirt-3.3.0.tar.xz libvirt-3.3.0.tar.xz.asc libvirtd.init libxl-def-usbctrl.patch revert-2841e675-mtu.patch New: ---- 1a4b21f1-set-EOF-on-end-of-stream.patch 5004f121-virFdStreamThread-dont-exceed-length.patch libvirt-3.4.0.tar.xz libvirt-3.4.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:24.891841930 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:24.895841367 +0200 @@ -19,12 +19,6 @@ # The configuration of libvirt is modified slightly for SLE %define with_sle_build %{?is_opensuse:0}%{!?is_opensuse:1} -# openSUSE13.1 and 13.2 do not understand %is_opensuse. Check for those -# explicitly and disable SLE build -%if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 - %define with_sle_build 0 -%endif - # The hypervisor drivers that run in libvirtd %define with_xen 0%{!?_without_xen:1} %define with_qemu 0%{!?_without_qemu:1} @@ -52,7 +46,6 @@ # A few optional bits off by default, we enable later %define with_cgconfig 0%{!?_without_cgconfig:0} -%define with_systemd 0%{!?_without_systemd:0} %define with_numactl 0%{!?_without_numactl:0} %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} @@ -70,7 +63,7 @@ %define with_libxl 0 %endif -# For SLE, further restrice Xen support to x86_64 only +# For SLE, further restrict Xen support to x86_64 only %if %{with_sle_build} %ifarch %arm aarch64 %define with_xen 0 @@ -136,16 +129,13 @@ %endif %endif -# Support systemd on 12.1 and later -%if 0%{?suse_version} >= 1210 - %define with_systemd 0%{!?_without_systemd:1} +# libvirt commit 37397320 changed the configure check for wireshark to use +# pkgconfig. Currently only the Leap 42.2 and Factory wireshark-devel packages +# provide wireshark.pc. Disable the dissector for SLE and Leap <= 42.1 +%if 0%{?sle_version} < 120200 && %{with_sle_build} + %define with_wireshark 0 %endif -# libvirt commit 37397320 changed the configure check for wireshark to -# use pkgconfig, but our wireshark packages do not provide wireshark.pc. -# Disable the dissector for now -%define with_wireshark 0 - # numad is used to manage the CPU and memory placement dynamically for # qemu, lxc, and uml drivers %if %{with_qemu} || %{with_lxc} || %{with_uml} @@ -175,7 +165,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 3.3.0 +Version: 3.4.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -219,10 +209,8 @@ BuildRequires: libtool # Needed for virkmodtest in 'make check' BuildRequires: modutils -%if %{with_systemd} BuildRequires: systemd BuildRequires: pkgconfig(systemd) -%endif %if %{with_xen} || %{with_libxl} BuildRequires: xen-devel %endif @@ -312,27 +300,15 @@ Source0: %{name}-%{version}.tar.xz Source1: %{name}-%{version}.tar.xz.asc Source2: %{name}.keyring -Source3: libvirtd.init -Source4: libvirtd-relocation-server.fw +Source3: libvirtd-relocation-server.fw Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: aeda1b8c-qemu-no-error-shutdown.patch -Patch1: 8023b21a-conf-ioapic.patch -Patch2: 6b5c6314-qemu-irqchip.patch -Patch3: 2020e2c6-conf-intremap.patch -Patch4: 04028a9d-qemu-intremap.patch -Patch5: d12781b4-conf-iommu-cache-mode-attr.patch -Patch6: a5691448-qemu-iommu-cache-mode.patch -Patch7: 3a276c65-conf-iommu-def-stability-check.patch -Patch8: 935d927a-conf-iommu-ABI-stability-check.patch -Patch9: 4cd3f241-fix-NULL-disk-source.patch -Patch10: 975ea20f-loopback-macro.patch -Patch11: dbb85e0c-libxl-graphics-listen-addr.patch +Patch0: 5004f121-virFdStreamThread-dont-exceed-length.patch +Patch1: 1a4b21f1-set-EOF-on-end-of-stream.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch -Patch102: libxl-def-usbctrl.patch # Need to go upstream Patch150: xen-pv-cdrom.patch Patch151: blockcopy-check-dst-identical-device.patch @@ -341,7 +317,6 @@ Patch154: libxl-set-migration-constraints.patch Patch155: libxl-set-cach-mode.patch Patch156: apparmor-fixes.patch -Patch157: revert-2841e675-mtu.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -403,10 +378,8 @@ # For virConnectGetSysinfo Requires: dmidecode %endif -%if %{with_systemd} # For service management %{?systemd_requires} -%endif %if %{with_numad} Requires: numad %endif @@ -901,19 +874,8 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 %patch100 -p1 %patch101 -p1 -%patch102 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -921,7 +883,6 @@ %patch154 -p1 %patch155 -p1 %patch156 -p1 -%patch157 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 @@ -1034,11 +995,6 @@ %else %define arg_sanlock --without-sanlock %endif -%if %{with_systemd} - %define arg_init_script --with-init-script=systemd -%else - %define arg_init_script --with-init-script=redhat -%endif %if %{with_firewalld} %define arg_firewalld --with-firewalld %else @@ -1061,7 +1017,7 @@ %define arg_loader_nvram --with-loader-nvram="$LOADERS" autoreconf -f -i -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" %configure --disable-static --with-pic \ %{?arg_xen} \ %{?arg_qemu} \ @@ -1120,7 +1076,7 @@ --with-qemu-group=%{qemu_group} \ %{?arg_loader_nvram} \ --without-login-shell \ - %{arg_init_script} \ + --with-init-script=systemd \ ac_cv_path_MODPROBE=/sbin/modprobe \ ac_cv_path_UDEVADM=/sbin/udevadm \ ac_cv_path_SHOWMOUNT=/usr/sbin/showmount \ @@ -1132,146 +1088,124 @@ %install %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 +cp examples/lxcconvert/virt-lxc-convert %{buildroot}/%{_bindir} +rm -f %{buildroot}/%{_libdir}/*.la %if %{with_wireshark} -rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.la +rm -f %{buildroot}/%{_libdir}/wireshark/plugins/libvirt.la %endif -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/connection-driver/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/connection-driver/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/storage-backend/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/storage-backend/*.a +rm -f %{buildroot}/%{_libdir}/*.a +rm -f %{buildroot}/%{_libdir}/%{name}/lock-driver/*.la +rm -f %{buildroot}/%{_libdir}/%{name}/lock-driver/*.a +rm -f %{buildroot}/%{_libdir}/%{name}/connection-driver/*.la +rm -f %{buildroot}/%{_libdir}/%{name}/connection-driver/*.a +rm -f %{buildroot}/%{_libdir}/%{name}/storage-backend/*.la +rm -f %{buildroot}/%{_libdir}/%{name}/storage-backend/*.a # remove currently unsupported locale(s) -for dir in $RPM_BUILD_ROOT/usr/share/locale/* +for dir in %{buildroot}/usr/share/locale/* do - sdir=`echo $dir | sed "s|$RPM_BUILD_ROOT||"` + sdir=`echo $dir | sed "s|%{buildroot}||"` if test -d $sdir ; then continue ; fi rm -rfv "$dir" done -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/hooks +mkdir -p %{buildroot}/%{_localstatedir}/lib/libvirt +mkdir -p %{buildroot}/%{_sysconfdir}/libvirt/hooks %find_lang %{name} # Add a README to the libvirt package with a note about the empty # file list -cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt.README << 'EOF' +cat > %{buildroot}/%{_docdir}/libvirt/libvirt.README << 'EOF' The libvirt package no longer contains any files. It exists now only to fulfill its 'Provides' contract. EOF -install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/dnsmasq/ -install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ -cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ - $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml +install -d -m 0755 %{buildroot}/%{_localstatedir}/lib/libvirt/dnsmasq/ +install -d -m 0755 %{buildroot}/%{_datadir}/libvirt/networks/ +cp %{buildroot}/%{_sysconfdir}/libvirt/qemu/networks/default.xml \ + %{buildroot}/%{_datadir}/libvirt/networks/default.xml +rm -f %{buildroot}/%{_sysconfdir}/libvirt/qemu/networks/default.xml +rm -f %{buildroot}/%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml # Strip auto-generated UUID - we need it generated per-install -sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml +sed -i -e "/<uuid>/d" %{buildroot}/%{_datadir}/libvirt/networks/default.xml %if %{with_lxc} -cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-lxc.README << 'EOF' +cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-lxc.README << 'EOF' Any empty package encapsulating requirements for a libvirtd capable of managing LXC. EOF %else -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc +rm -rf %{buildroot}/%{_sysconfdir}/libvirt/lxc.conf +rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_lxc.aug +rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug +rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.lxc %endif %if %{with_qemu} -cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-qemu.README << 'EOF' +cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-qemu.README << 'EOF' Any empty package encapsulating requirements for a libvirtd capable of managing QEMU/KVM. EOF %else -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu +rm -rf %{buildroot}/%{_sysconfdir}/libvirt/qemu.conf +rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_qemu.aug +rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug +rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.qemu %endif %if %{with_uml} -cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-uml.README << 'EOF' +cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-uml.README << 'EOF' Any empty package encapsulating requirements for a libvirtd capable of managing UML. EOF %else -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml +rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.uml %endif %if %{with_vbox} -cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-vbox.README << 'EOF' +cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-vbox.README << 'EOF' Any empty package encapsulating requirements for a libvirtd capable of managing VirtualBox. EOF %endif %if %{with_xen} || %{with_libxl} -cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-xen.README << 'EOF' +cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-xen.README << 'EOF' Any empty package encapsulating requirements for a libvirtd capable of managing Xen. EOF %endif %if ! %{with_libxl} -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 +rm -f %{buildroot}/%{_sysconfdir}/libvirt/libxl.conf +rm -f %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.libxl +rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_libxl.aug +rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %endif %if ! %{with_sanlock} -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug +rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirt_sanlock.aug +rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug %endif # init scripts -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates -# Currently using our own libvirtd init script -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirtd -%if %{with_systemd} -ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd -%else -install %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd -ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd -%endif -mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd -rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/60-libvirtd.conf -# For other services, use the in-tree scripts -%if %{with_systemd} -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlogd -ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcvirtlogd -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd -ln -s %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcvirtlockd -%else -mv $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlogd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/virtlogd -ln -s /etc/init.d/virtlogd $RPM_BUILD_ROOT%{_sbindir}/rcvirtlogd -mv $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/virtlockd -ln -s /etc/init.d/virtlockd $RPM_BUILD_ROOT%{_sbindir}/rcvirtlockd -%endif -mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/virtlogd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd -mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/virtlockd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd +mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates +rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf +mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd +mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests +# Provide rc symlink backward compatibility +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlogd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlockd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirt-guests + #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 -%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 -%else -mv $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirt-guests -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 +mkdir -p %{buildroot}/%{_fwdefdir} +install -m 644 %{S:3} %{buildroot}/%{_fwdefdir}/libvirtd-relocation-server + %ifarch %{power64} s390x x86_64 -mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ - $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp -mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ - $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp +mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_probes.stp \ + %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_probes-64.stp +mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ + %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp %endif -%fdupes -s $RPM_BUILD_ROOT +%fdupes -s %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %check cd tests @@ -1297,39 +1231,28 @@ fi %pre daemon -%if %{with_systemd} %service_add_pre libvirtd.service %service_add_pre virtlockd.service virtlockd.socket %service_add_pre virtlogd.service virtlogd.socket -%endif %{_bindir}/getent group libvirt >/dev/null || \ %{_sbindir}/groupadd -r libvirt || : %post daemon /sbin/ldconfig -%if %{with_systemd} %service_add_post libvirtd.service %service_add_post virtlockd.service virtlockd.socket %service_add_post virtlogd.service virtlogd.socket -%endif %{fillup_only -n libvirtd} %{fillup_only -n virtlockd} %{fillup_only -n virtlogd} %preun daemon -%if %{with_systemd} %service_del_preun libvirtd.service %service_del_preun virtlockd.service virtlockd.socket %service_del_preun virtlogd.service virtlogd.socket -%else -%stop_on_removal libvirtd -%stop_on_removal virtlockd -%stop_on_removal virtlogd -%endif %postun daemon /sbin/ldconfig -%if %{with_systemd} # On upgrade, defer restarting daemons until %posttrans if test $1 -eq 0 ; then for service in libvirtd virtlockd virtlogd ; do @@ -1337,29 +1260,18 @@ done /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : fi -%else -%restart_on_update libvirtd -%restart_on_update virtlockd -%restart_on_update virtlogd -%endif -%if %{with_systemd} %service_del_postun libvirtd.service %service_del_postun virtlockd.service virtlockd.socket %service_del_postun virtlogd.service virtlogd.socket -%else - %insserv_cleanup -%endif %posttrans daemon # All connection drivers should be installed post transaction. # Time to restart daemons. -%if %{with_systemd} if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then for service in libvirtd virtlockd virtlogd ; do /usr/bin/systemctl try-restart ${service}.service >/dev/null 2>&1 || : done fi -%endif # In upgrade scenario we must explicitly enable virtlockd/virtlogd # sockets, if libvirtd is already enabled and start them if @@ -1367,17 +1279,10 @@ # guests %triggerpostun daemon -- libvirt-daemon < 1.3.0 if [ $1 -ge 1 ] ; then -%if %{with_systemd} /usr/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && /usr/bin/systemctl enable virtlogd.socket || : /usr/bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 && /usr/bin/systemctl start virtlogd.socket || : -%else - /sbin/chkconfig libvirtd 1>/dev/null 2>&1 && - /sbin/chkconfig virtlogd on || : - /sbin/service libvirtd status 1>/dev/null 2>&1 && - /sbin/service virtlogd start || : -%endif fi %post daemon-config-network @@ -1390,32 +1295,20 @@ fi %pre client -%if %{with_systemd} %service_add_pre libvirt-guests.service -%endif %post client -%if %{with_systemd} %service_add_post libvirt-guests.service -%endif %{fillup_only -n libvirt-guests} %preun client -%if %{with_systemd} %service_del_preun libvirt-guests.service -%else -%stop_on_removal libvirt-guests -%endif if [ $1 = 0 ]; then rm -f /var/lib/libvirt/libvirt-guests fi %postun client -%if %{with_systemd} %service_del_postun libvirt-guests.service -%else -%insserv_cleanup -%endif %post libs /sbin/ldconfig @@ -1442,18 +1335,12 @@ %{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd %{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd %{_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 %{_unitdir}/virtlockd.socket -%else -%config /etc/init.d/libvirtd -%config /etc/init.d/virtlogd -%config /etc/init.d/virtlockd -%endif %{_sbindir}/rclibvirtd %{_sbindir}/rcvirtlogd %{_sbindir}/rcvirtlockd @@ -1694,11 +1581,7 @@ %dir %{_libdir}/%{name} %attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh %{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests -%if %{with_systemd} %{_unitdir}/libvirt-guests.service -%else -%config /etc/init.d/libvirt-guests -%endif %{_sbindir}/rclibvirt-guests %files libs -f %{name}.lang @@ -1765,6 +1648,7 @@ %doc %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/internals %doc %{_docdir}/%{name}/logos +%doc %{_docdir}/%{name}/fonts # API docs %dir %{_datadir}/gtk-doc/html/libvirt/ ++++++ 1a4b21f1-set-EOF-on-end-of-stream.patch ++++++ commit 1a4b21f1c67a3ddf39d11bba39c1dee869131636 Author: Michal Privoznik <[email protected]> Date: Tue Jun 6 14:45:55 2017 +0200 virNetClientStreamQueuePacket: Set st->incomingEOF on the end of stream While reworking client side of streams, I had to postpone payload decoding so that stream holes and stream data can be distinguished in virNetClientStreamRecvPacket. That's merely what 18944b7aea46d does. However, I accidentally removed one important bit: when server sends us an empty STREAM packet (with no payload) - meaning end of stream - st->incomingEOF flag needs to be set. It used to be before I touched the code. After I removed it, virNetClientStreamRecvPacket will try to fetch more data from the stream, but it will never come. Signed-off-by: Michal Privoznik <[email protected]> Reviewed-by: Jim Fehlig <[email protected]> Index: libvirt-3.4.0/src/rpc/virnetclientstream.c =================================================================== --- libvirt-3.4.0.orig/src/rpc/virnetclientstream.c +++ libvirt-3.4.0/src/rpc/virnetclientstream.c @@ -278,6 +278,15 @@ int virNetClientStreamQueuePacket(virNet VIR_DEBUG("Incoming stream message: stream=%p message=%p", st, msg); + if (msg->bufferLength == msg->bufferOffset) { + /* No payload means end of the stream. */ + virObjectLock(st); + st->incomingEOF = true; + virNetClientStreamEventTimerUpdate(st); + virObjectUnlock(st); + return 0; + } + /* Unfortunately, we must allocate new message as the one we * get in @msg is going to be cleared later in the process. */ ++++++ 5004f121-virFdStreamThread-dont-exceed-length.patch ++++++ commit 5004f121bc572c58d9721bf7bf3c3a1988720ba8 Author: Michal Privoznik <[email protected]> Date: Mon Jun 5 13:22:23 2017 +0200 virFDStreamThread: Make sure we won't exceed @length There's a problem with current streams after I switched them from iohelper to thread implementation. Previously, iohelper made sure not to exceed specified @length resulting in the pipe EOF appearing at the exact right moment (the pipe was used to tunnel the data from the iohelper to the daemon). Anyway, when switching to thread I had to write the I/O code from scratch. Whilst doing that I took an inspiration from the iohelper code, but since the usage of pipe switched to slightly different meaning, there was no 1:1 relationship between the codes. Moreover, after introducing VIR_FDSTREAM_MSG_TYPE_HOLE, the condition that should made sure we won't exceed @length was completely wrong. The fix is to: a) account for holes for @length b) cap not just data sections but holes too (if @length would be exceeded) For this purpose, the condition needs to be brought closer to the code that handles holes and data sections. Signed-off-by: Michal Privoznik <[email protected]> Index: libvirt-3.4.0/src/util/virfdstream.c =================================================================== --- libvirt-3.4.0.orig/src/util/virfdstream.c +++ libvirt-3.4.0/src/util/virfdstream.c @@ -420,6 +420,8 @@ virFDStreamThreadDoRead(virFDStreamDataP const int fdout, const char *fdinname, const char *fdoutname, + size_t length, + size_t total, size_t *dataLen, size_t buflen) { @@ -433,10 +435,18 @@ virFDStreamThreadDoRead(virFDStreamDataP if (virFileInData(fdin, &inData, §ionLen) < 0) goto error; + if (length && + sectionLen > length - total) + sectionLen = length - total; + if (inData) *dataLen = sectionLen; } + if (length && + buflen > length - total) + buflen = length - total; + if (VIR_ALLOC(msg) < 0) goto error; @@ -578,13 +588,6 @@ virFDStreamThread(void *opaque) while (1) { ssize_t got; - if (length && - (length - total) < buflen) - buflen = length - total; - - if (buflen == 0) - break; /* End of requested data from client */ - while (doRead == (fdst->msg != NULL) && !fdst->threadQuit) { if (virCondWait(&fdst->threadCond, &fdst->parent.lock)) { @@ -608,6 +611,7 @@ virFDStreamThread(void *opaque) got = virFDStreamThreadDoRead(fdst, sparse, fdin, fdout, fdinname, fdoutname, + length, total, &dataLen, buflen); else got = virFDStreamThreadDoWrite(fdst, sparse, ++++++ apparmor-fixes.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:24.971830655 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:24.975830092 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-3.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-3.4.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.3.0/examples/apparmor/libvirt-qemu +--- libvirt-3.4.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-3.4.0/examples/apparmor/libvirt-qemu @@ -146,6 +146,9 @@ # for restore /{usr/,}bin/bash rmix, ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:24.987828400 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:24.987828400 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-3.3.0/examples/apparmor/libvirt-lxc +Index: libvirt-3.4.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-3.3.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-3.3.0/examples/apparmor/libvirt-lxc +--- libvirt-3.4.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-3.4.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.011825019 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.015824454 +0200 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-3.3.0/src/qemu/qemu_driver.c +Index: libvirt-3.4.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-3.3.0.orig/src/qemu/qemu_driver.c -+++ libvirt-3.3.0/src/qemu/qemu_driver.c -@@ -16566,6 +16566,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-3.4.0.orig/src/qemu/qemu_driver.c ++++ libvirt-3.4.0/src/qemu/qemu_driver.c +@@ -16586,6 +16586,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } ++++++ libvirt-3.3.0.tar.xz -> libvirt-3.4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-3.3.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-3.4.0.tar.xz differ: char 15, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.051819381 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.055818817 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-3.3.0/tools/libvirt-guests.init.in +Index: libvirt-3.4.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-3.3.0.orig/tools/libvirt-guests.init.in -+++ libvirt-3.3.0/tools/libvirt-guests.init.in +--- libvirt-3.4.0.orig/tools/libvirt-guests.init.in ++++ libvirt-3.4.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 @@ # exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-3.3.0/tools/libvirt-guests.sh.in +Index: libvirt-3.4.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-3.3.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-3.3.0/tools/libvirt-guests.sh.in +--- libvirt-3.4.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-3.4.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -208,10 +208,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-3.3.0/tools/libvirt-guests.sysconf +Index: libvirt-3.4.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-3.3.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-3.3.0/tools/libvirt-guests.sysconf +--- libvirt-3.4.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-3.4.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.067817126 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.067817126 +0200 @@ -2,10 +2,10 @@ From: <[email protected]> -Index: libvirt-3.3.0/src/cpu/cpu_map.xml +Index: libvirt-3.4.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-3.3.0.orig/src/cpu/cpu_map.xml -+++ libvirt-3.3.0/src/cpu/cpu_map.xml +--- libvirt-3.4.0.orig/src/cpu/cpu_map.xml ++++ libvirt-3.4.0/src/cpu/cpu_map.xml @@ -1569,6 +1569,8 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> @@ -14,4 +14,4 @@ + <pvr value='0x004b0201' mask='0xffffffff'/> </model> - <!-- Freescale-based CPU models --> + <model name='POWER9'> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.087814307 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.091813743 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-3.3.0/configure.ac +Index: libvirt-3.4.0/configure.ac =================================================================== ---- libvirt-3.3.0.orig/configure.ac -+++ libvirt-3.3.0/configure.ac +--- libvirt-3.4.0.orig/configure.ac ++++ libvirt-3.4.0/configure.ac @@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -18,7 +18,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_OPENWSMAN -@@ -969,6 +971,7 @@ LIBVIRT_RESULT_LIBXL +@@ -979,6 +981,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,10 +26,10 @@ LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN -Index: libvirt-3.3.0/src/Makefile.am +Index: libvirt-3.4.0/src/Makefile.am =================================================================== ---- libvirt-3.3.0.orig/src/Makefile.am -+++ libvirt-3.3.0/src/Makefile.am +--- libvirt-3.4.0.orig/src/Makefile.am ++++ libvirt-3.4.0/src/Makefile.am @@ -1034,6 +1034,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c @@ -52,11 +52,11 @@ if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-3.3.0/tools/virsh.c +Index: libvirt-3.4.0/tools/virsh.c =================================================================== ---- libvirt-3.3.0.orig/tools/virsh.c -+++ libvirt-3.3.0/tools/virsh.c -@@ -567,6 +567,8 @@ virshShowVersion(vshControl *ctl ATTRIBU +--- libvirt-3.4.0.orig/tools/virsh.c ++++ libvirt-3.4.0/tools/virsh.c +@@ -570,6 +570,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -65,10 +65,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-3.3.0/src/interface/interface_backend_netcf.c +Index: libvirt-3.4.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-3.3.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-3.3.0/src/interface/interface_backend_netcf.c +--- libvirt-3.4.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-3.4.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -152,10 +152,10 @@ if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-3.3.0/src/interface/interface_driver.c +Index: libvirt-3.4.0/src/interface/interface_driver.c =================================================================== ---- libvirt-3.3.0.orig/src/interface/interface_driver.c -+++ libvirt-3.3.0/src/interface/interface_driver.c +--- libvirt-3.4.0.orig/src/interface/interface_driver.c ++++ libvirt-3.4.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -173,10 +173,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-3.3.0/m4/virt-netcontrol.m4 +Index: libvirt-3.4.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-3.3.0/m4/virt-netcontrol.m4 ++++ libvirt-3.4.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.123809233 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.127808669 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-3.3.0/daemon/libvirtd.conf +Index: libvirt-3.4.0/daemon/libvirtd.conf =================================================================== ---- libvirt-3.3.0.orig/daemon/libvirtd.conf -+++ libvirt-3.3.0/daemon/libvirtd.conf +--- libvirt-3.4.0.orig/daemon/libvirtd.conf ++++ libvirt-3.4.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 @@ # 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-3.3.0/daemon/libvirtd-config.c +Index: libvirt-3.4.0/daemon/libvirtd-config.c =================================================================== ---- libvirt-3.3.0.orig/daemon/libvirtd-config.c -+++ libvirt-3.3.0/daemon/libvirtd-config.c +--- libvirt-3.4.0.orig/daemon/libvirtd-config.c ++++ libvirt-3.4.0/daemon/libvirtd-config.c @@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-3.3.0/daemon/test_libvirtd.aug.in +Index: libvirt-3.4.0/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-3.3.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-3.3.0/daemon/test_libvirtd.aug.in +--- libvirt-3.4.0.orig/daemon/test_libvirtd.aug.in ++++ libvirt-3.4.0/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.135807542 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.139806978 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-3.3.0/daemon/libvirtd.sysconf +Index: libvirt-3.4.0/daemon/libvirtd.sysconf =================================================================== ---- libvirt-3.3.0.orig/daemon/libvirtd.sysconf -+++ libvirt-3.3.0/daemon/libvirtd.sysconf +--- libvirt-3.4.0.orig/daemon/libvirtd.sysconf ++++ libvirt-3.4.0/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.159804160 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.163803596 +0200 @@ -8,10 +8,10 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-3.3.0/src/libxl/libxl_driver.c +Index: libvirt-3.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.3.0/src/libxl/libxl_driver.c +--- libvirt-3.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-3.4.0/src/libxl/libxl_driver.c @@ -1381,6 +1381,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } ++++++ libxl-qemu-emulator-caps.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.175801905 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.179801341 +0200 @@ -8,10 +8,10 @@ See FATE#320638 for details. -Index: libvirt-3.3.0/src/libxl/libxl_capabilities.c +Index: libvirt-3.4.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-3.3.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-3.3.0/src/libxl/libxl_capabilities.c +--- libvirt-3.4.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-3.4.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" @@ -20,7 +20,7 @@ #define VIR_FROM_THIS VIR_FROM_LIBXL -@@ -491,7 +492,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC +@@ -506,7 +507,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC if ((guest = virCapabilitiesAddGuest(caps, guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, guest_archs[i].arch, ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.191799650 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.191799650 +0200 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-3.3.0/src/libxl/libxl_conf.c +Index: libvirt-3.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.3.0/src/libxl/libxl_conf.c +--- libvirt-3.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-3.4.0/src/libxl/libxl_conf.c @@ -645,6 +645,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.207797395 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.207797395 +0200 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-3.3.0/include/libvirt/libvirt-domain.h +Index: libvirt-3.4.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-3.3.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-3.3.0/include/libvirt/libvirt-domain.h +--- libvirt-3.4.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-3.4.0/include/libvirt/libvirt-domain.h @@ -1008,6 +1008,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,10 +52,10 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-3.3.0/src/libxl/libxl_driver.c +Index: libvirt-3.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.3.0/src/libxl/libxl_driver.c +--- libvirt-3.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-3.4.0/src/libxl/libxl_driver.c @@ -6105,6 +6105,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-3.3.0/src/libxl/libxl_migration.c +Index: libvirt-3.4.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-3.3.0.orig/src/libxl/libxl_migration.c -+++ libvirt-3.3.0/src/libxl/libxl_migration.c +--- libvirt-3.4.0.orig/src/libxl/libxl_migration.c ++++ libvirt-3.4.0/src/libxl/libxl_migration.c @@ -359,18 +359,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, @@ -263,10 +263,10 @@ virObjectLock(vm); cleanup: -Index: libvirt-3.3.0/src/libxl/libxl_migration.h +Index: libvirt-3.4.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-3.3.0.orig/src/libxl/libxl_migration.h -+++ libvirt-3.3.0/src/libxl/libxl_migration.h +--- libvirt-3.4.0.orig/src/libxl/libxl_migration.h ++++ libvirt-3.4.0/src/libxl/libxl_migration.h @@ -39,6 +39,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -311,11 +311,11 @@ virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, -Index: libvirt-3.3.0/tools/virsh-domain.c +Index: libvirt-3.4.0/tools/virsh-domain.c =================================================================== ---- libvirt-3.3.0.orig/tools/virsh-domain.c -+++ libvirt-3.3.0/tools/virsh-domain.c -@@ -10205,6 +10205,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-3.4.0.orig/tools/virsh-domain.c ++++ libvirt-3.4.0/tools/virsh-domain.c +@@ -10213,6 +10213,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_BOOL, .help = N_("use TLS for migration") }, @@ -338,7 +338,7 @@ {.name = NULL} }; -@@ -10228,6 +10244,7 @@ doMigrate(void *opaque) +@@ -10236,6 +10252,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -346,7 +346,7 @@ sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10347,6 +10364,27 @@ doMigrate(void *opaque) +@@ -10355,6 +10372,27 @@ doMigrate(void *opaque) goto save_error; } @@ -374,13 +374,13 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-3.3.0/tools/virsh.pod +Index: libvirt-3.4.0/tools/virsh.pod =================================================================== ---- libvirt-3.3.0.orig/tools/virsh.pod -+++ libvirt-3.3.0/tools/virsh.pod -@@ -1753,6 +1753,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. +--- libvirt-3.4.0.orig/tools/virsh.pod ++++ libvirt-3.4.0/tools/virsh.pod +@@ -1758,6 +1758,14 @@ Providing I<--tls> causes the migration + the migration of the domain. Usage requires proper TLS setup for both source + and target. +SUSE-specific options for Xen: I<--max_iters> B<num> allows specifying the maximum +number of iterations before final suspend. Default is 30. I<--max_factor> B<num> ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.219795703 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.219795703 +0200 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-3.3.0/src/libxl/libxl_conf.c +Index: libvirt-3.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.3.0/src/libxl/libxl_conf.c +--- libvirt-3.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-3.4.0/src/libxl/libxl_conf.c @@ -645,6 +645,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.231794013 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.235793448 +0200 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-3.3.0/src/lxc/lxc_controller.c +Index: libvirt-3.4.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-3.3.0.orig/src/lxc/lxc_controller.c -+++ libvirt-3.3.0/src/lxc/lxc_controller.c +--- libvirt-3.4.0.orig/src/lxc/lxc_controller.c ++++ libvirt-3.4.0/src/lxc/lxc_controller.c @@ -73,6 +73,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -33,10 +33,10 @@ return ret; } -Index: libvirt-3.3.0/src/lxc/lxc_driver.c +Index: libvirt-3.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-3.3.0.orig/src/lxc/lxc_driver.c -+++ libvirt-3.3.0/src/lxc/lxc_driver.c +--- libvirt-3.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-3.4.0/src/lxc/lxc_driver.c @@ -76,6 +76,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -61,10 +61,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-3.3.0/src/lxc/lxc_process.c +Index: libvirt-3.4.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-3.3.0.orig/src/lxc/lxc_process.c -+++ libvirt-3.3.0/src/lxc/lxc_process.c +--- libvirt-3.4.0.orig/src/lxc/lxc_process.c ++++ libvirt-3.4.0/src/lxc/lxc_process.c @@ -52,6 +52,7 @@ #include "viratomic.h" #include "virprocess.h" ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.247791758 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.247791758 +0200 @@ -17,10 +17,10 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-3.3.0/src/network/bridge_driver.c +Index: libvirt-3.4.0/src/network/bridge_driver.c =================================================================== ---- libvirt-3.3.0.orig/src/network/bridge_driver.c -+++ libvirt-3.3.0/src/network/bridge_driver.c +--- libvirt-3.4.0.orig/src/network/bridge_driver.c ++++ libvirt-3.4.0/src/network/bridge_driver.c @@ -1409,7 +1409,14 @@ networkDnsmasqConfContents(virNetworkObj if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -37,10 +37,10 @@ } if (ipdef->tftproot) { -Index: libvirt-3.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-3.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-3.3.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-3.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-3.4.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-3.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.259790066 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.259790066 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-3.3.0/src/util/virarch.c +Index: libvirt-3.4.0/src/util/virarch.c =================================================================== ---- libvirt-3.3.0.orig/src/util/virarch.c -+++ libvirt-3.3.0/src/util/virarch.c +--- libvirt-3.4.0.orig/src/util/virarch.c ++++ libvirt-3.4.0/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 ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.271788375 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.275787811 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-3.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-3.4.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.3.0/examples/apparmor/libvirt-qemu +--- libvirt-3.4.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-3.4.0/examples/apparmor/libvirt-qemu @@ -154,3 +154,6 @@ /etc/udev/udev.conf r, /sys/bus/ r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.287786120 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.287786120 +0200 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-3.3.0/src/xenconfig/xen_common.c +Index: libvirt-3.4.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-3.3.0.orig/src/xenconfig/xen_common.c -+++ libvirt-3.3.0/src/xenconfig/xen_common.c +--- libvirt-3.4.0.orig/src/xenconfig/xen_common.c ++++ libvirt-3.4.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ 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-3.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.4.0/src/xenconfig/xen_sxpr.c @@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; ++++++ suse-libvirtd-service.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.299784428 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.303783865 +0200 @@ -5,10 +5,10 @@ should be king and override xendomains. bsc#1015348 -Index: libvirt-3.3.0/daemon/libvirtd.service.in +Index: libvirt-3.4.0/daemon/libvirtd.service.in =================================================================== ---- libvirt-3.3.0.orig/daemon/libvirtd.service.in -+++ libvirt-3.3.0/daemon/libvirtd.service.in +--- libvirt-3.4.0.orig/daemon/libvirtd.service.in ++++ libvirt-3.4.0/daemon/libvirtd.service.in @@ -15,6 +15,7 @@ After=apparmor.service After=local-fs.target After=remote-fs.target ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.319781610 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.323781047 +0200 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-3.3.0/src/qemu/qemu.conf +Index: libvirt-3.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-3.3.0.orig/src/qemu/qemu.conf -+++ libvirt-3.3.0/src/qemu/qemu.conf +--- libvirt-3.4.0.orig/src/qemu/qemu.conf ++++ libvirt-3.4.0/src/qemu/qemu.conf @@ -332,11 +332,20 @@ # isolation, but it cannot appear in a list of drivers. # ++++++ systemd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.335779355 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.339778792 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-3.3.0/daemon/libvirtd.service.in +Index: libvirt-3.4.0/daemon/libvirtd.service.in =================================================================== ---- libvirt-3.3.0.orig/daemon/libvirtd.service.in -+++ libvirt-3.3.0/daemon/libvirtd.service.in +--- libvirt-3.4.0.orig/daemon/libvirtd.service.in ++++ libvirt-3.4.0/daemon/libvirtd.service.in @@ -14,6 +14,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.355776537 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.355776537 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-3.3.0/src/locking/virtlockd.sysconf +Index: libvirt-3.4.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-3.3.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-3.3.0/src/locking/virtlockd.sysconf +--- libvirt-3.4.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-3.4.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-3.3.0/src/locking/virtlockd.init.in +Index: libvirt-3.4.0/src/locking/virtlockd.init.in =================================================================== ---- libvirt-3.3.0.orig/src/locking/virtlockd.init.in -+++ libvirt-3.3.0/src/locking/virtlockd.init.in +--- libvirt-3.4.0.orig/src/locking/virtlockd.init.in ++++ libvirt-3.4.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 # ++++++ virtlogd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.367774845 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.367774845 +0200 @@ -1,9 +1,9 @@ Adjust virtlogd init files to conform to SUSE standards -Index: libvirt-3.3.0/src/logging/virtlogd.init.in +Index: libvirt-3.4.0/src/logging/virtlogd.init.in =================================================================== ---- libvirt-3.3.0.orig/src/logging/virtlogd.init.in -+++ libvirt-3.3.0/src/logging/virtlogd.init.in +--- libvirt-3.4.0.orig/src/logging/virtlogd.init.in ++++ libvirt-3.4.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 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-3.3.0/src/logging/virtlogd.sysconf +Index: libvirt-3.4.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-3.3.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-3.3.0/src/logging/virtlogd.sysconf +--- libvirt-3.4.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-3.4.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.383772590 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.387772027 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-3.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.4.0/src/xenconfig/xen_sxpr.c @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, ++++++ xen-sxpr-disk-type.patch ++++++ --- /var/tmp/diff_new_pack.swc1my/_old 2017-06-20 10:59:25.399770335 +0200 +++ /var/tmp/diff_new_pack.swc1my/_new 2017-06-20 10:59:25.399770335 +0200 @@ -6,10 +6,10 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-3.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.4.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 */
