Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2019-02-04 21:23:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt"
Mon Feb 4 21:23:52 2019 rev:271 rq:668191 version:5.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2019-01-08 12:18:28.720925604 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt.new.28833/libvirt.changes 2019-02-04 21:23:58.047616900 +0100
@@ -1,0 +2,37 @@
+Wed Jan 23 20:53:29 UTC 2019 - James Fehlig
+
+- apparmor: add support for named profiles and convert libvirtd
+ profile to a named profile
+ 70c2933d-apparmor-named-profiles.patch,
+ a3ab6d42-apparmor-conv-libvirtd-named-profile.patch
+ boo#1118952
+- libxl: save current memory value after successful balloon
+ 11c8aca9-libxl-set-mem-after-balloon.patch
+ bsc#1120813
+
+-------------------------------------------------------------------
+Wed Jan 23 10:23:23 UTC 2019 - Jan Engelhardt
+
+- Noun phrase for %description doc.
+- Remove idempotent %if..%endif pair around
+ %package bash-completion.
+- Reduce hard requirements on bash-c and documentation.
+
+-------------------------------------------------------------------
+Thu Jan 17 16:50:57 UTC 2019 - James Fehlig
+
+- Enable bash completion in Leap15/SLE15 and newer
+
+-------------------------------------------------------------------
+Tue Jan 15 22:25:14 UTC 2019 - James Fehlig
+
+- Update to libvirt 5.0.0
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Remove UML hypervisor driver
+ - Dropped patches:
+ de09ae2f-libxl-support-openvswitch.patch,
+ 0a1b5653-xenconfig-support-openvswitch.patch
+ - FATE#320928, FATE#325817, FATE#326380, FATE#326698
+
+-------------------------------------------------------------------
Old:
----
0a1b5653-xenconfig-support-openvswitch.patch
de09ae2f-libxl-support-openvswitch.patch
libvirt-4.10.0.tar.xz
libvirt-4.10.0.tar.xz.asc
New:
----
11c8aca9-libxl-set-mem-after-balloon.patch
70c2933d-apparmor-named-profiles.patch
a3ab6d42-apparmor-conv-libvirtd-named-profile.patch
libvirt-5.0.0.tar.xz
libvirt-5.0.0.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.311616343 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.311616343 +0100
@@ -24,7 +24,6 @@
# The hypervisor drivers that run in libvirtd
%define with_qemu 0%{!?_without_qemu:1}
%define with_lxc 0%{!?_without_lxc:1}
-%define with_uml 0%{!?_without_uml:1}
%define with_libxl 0%{!?_without_libxl:1}
%define with_vbox 0%{!?_without_vbox:1}
@@ -91,7 +90,6 @@
%if ! 0%{?is_opensuse}
%define with_openvz 0
%define with_vbox 0
- %define with_uml 0
%define with_vmware 0
%define with_hyperv 0
%endif
@@ -111,10 +109,9 @@
%define with_libssh 1
%endif
-# TODO: On what distros can we support bash-completion?
-# SLE12 builds seem fine, but configure fails to detect
-# completion support on openSUSE distros.
-%define with_bash_completion 0%{!?_without_bash_completion:0}
+%if 0%{?suse_version} >= 1500
+ %define with_bash_completion 0%{!?_without_bash_completion:1}
+%endif
# rbd enablement is a bit tricky. For x86_64
%ifarch x86_64
@@ -154,8 +151,8 @@
%endif
# numad is used to manage the CPU and memory placement dynamically for
-# qemu, lxc, and uml drivers
-%if %{with_qemu} || %{with_lxc} || %{with_uml}
+# qemu and lxc drivers
+%if %{with_qemu} || %{with_lxc}
# Enable numad for most architectures. Handle aarch64 separately
%ifnarch s390 s390x %arm %ix86 aarch64
%define with_numad 0%{!?_without_numad:1}
@@ -185,7 +182,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 4.10.0
+Version: 5.0.0
Release: 0
Summary: Library providing a virtualization API
License: LGPL-2.1-or-later
@@ -203,9 +200,6 @@
%if %{with_qemu}
Requires: %{name}-daemon-driver-qemu = %{version}-%{release}
%endif
-%if %{with_uml}
-Requires: %{name}-daemon-driver-uml = %{version}-%{release}
-%endif
%if %{with_vbox}
Requires: %{name}-daemon-driver-vbox = %{version}-%{release}
%endif
@@ -236,7 +230,7 @@
BuildRequires: libacl-devel
%endif
%if %{with_bash_completion}
-BuildRequires: bash-completion >= 2.0
+BuildRequires: bash-completion-devel >= 2.0
%endif
BuildRequires: fdupes
BuildRequires: libattr-devel
@@ -338,8 +332,9 @@
Source99: baselibs.conf
Source100: %{name}-rpmlintrc
# Upstream patches
-Patch0: de09ae2f-libxl-support-openvswitch.patch
-Patch1: 0a1b5653-xenconfig-support-openvswitch.patch
+Patch0: 11c8aca9-libxl-set-mem-after-balloon.patch
+Patch1: 70c2933d-apparmor-named-profiles.patch
+Patch2: a3ab6d42-apparmor-conv-libvirtd-named-profile.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -390,7 +385,7 @@
BuildArch: noarch
%description doc
-Includes the API reference for the libvirt C library, and a complete
+The API reference for the libvirt C library, and a
copy of the libvirt.org website documentation.
%package daemon
@@ -692,17 +687,6 @@
an implementation of the hypervisor driver APIs using
the Linux kernel
-%package daemon-driver-uml
-Summary: User Mode Linux driver plugin for the libvirtd daemon
-Group: System/Management
-Requires: %{name}-daemon = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-
-%description daemon-driver-uml
-The UML driver plugin for the libvirtd daemon, providing
-an implementation of the hypervisor driver APIs using
-User Mode Linux
-
%package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon
Group: System/Management
@@ -756,22 +740,6 @@
Server side daemon and driver required to manage the virtualization
capabilities of LXC
-%package daemon-uml
-Summary: Server side daemon & driver required to run UML guests
-Group: System/Management
-Requires: %{name}-daemon = %{version}-%{release}
-Requires: %{name}-daemon-driver-interface = %{version}-%{release}
-Requires: %{name}-daemon-driver-network = %{version}-%{release}
-Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
-Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
-Requires: %{name}-daemon-driver-secret = %{version}-%{release}
-Requires: %{name}-daemon-driver-storage = %{version}-%{release}
-Requires: %{name}-daemon-driver-uml = %{version}-%{release}
-
-%description daemon-uml
-Server side daemon and driver required to manage the virtualization
-capabilities of UML
-
%package daemon-xen
Summary: Server side daemon & driver required to run XEN guests
Group: System/Management
@@ -819,7 +787,7 @@
Requires: cyrus-sasl
Requires: gnutls
%if %{with_bash_completion}
-Requires: %{name}-bash-completion = %{version}-%{release}
+Recommends: %{name}-bash-completion = %{version}-%{release}
%endif
%description client
@@ -845,7 +813,7 @@
Requires: %{name}-libs = %{version}-%{release}
Requires: readline
%if %{with_bash_completion}
-Requires: %{name}-bash-completion = %{version}-%{release}
+Recommends: %{name}-bash-completion = %{version}-%{release}
%endif
%description admin
@@ -863,7 +831,7 @@
Summary: Libraries, includes, etc. to compile with the libvirt library
Group: Development/Libraries/C and C++
Requires: %{name}-client = %{version}-%{release}
-Requires: %{name}-doc = %{version}-%{release}
+Suggests: %{name}-doc = %{version}-%{release}
Requires: pkg-config
%description devel
@@ -902,6 +870,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%patch100 -p1
%patch101 -p1
%patch150 -p1
@@ -954,11 +923,6 @@
%else
%define arg_vbox --without-vbox
%endif
-%if %{with_uml}
- %define arg_uml --with-uml
-%else
- %define arg_uml --without-uml
-%endif
%if %{with_phyp}
%define arg_phyp --with-phyp
%else
@@ -1066,7 +1030,6 @@
--with-avahi \
--with-polkit \
--with-libvirtd \
- %{?arg_uml} \
%{?arg_phyp} \
%{?arg_esx} \
%{?arg_hyperv} \
@@ -1187,14 +1150,6 @@
rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.qemu
%endif
-%if %{with_uml}
-cat > %{buildroot}/%{_docdir}/%{name}/libvirt-daemon-uml.README << 'EOF'
-Any empty package encapsulating requirements for a libvirtd capable
-of managing UML.
-EOF
-%else
-rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.uml
-%endif
%if %{with_vbox}
cat > %{buildroot}/%{_docdir}/%{name}/libvirt-daemon-vbox.README << 'EOF'
Any empty package encapsulating requirements for a libvirtd capable
@@ -1399,9 +1354,6 @@
%if %{with_qemu}
%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
%endif
-%if %{with_bash_completion}
-%{_datadir}/bash-completion/completions/virsh
-%endif
%dir %{_localstatedir}/lib/%{name}/
%dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/images/
%dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/filesystems/
@@ -1568,16 +1520,6 @@
%endif
%endif
-%if %{with_uml}
-
-%files daemon-driver-uml
-%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
-%dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/uml/
-%dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/uml/
-%dir %{_libdir}/%{name}/connection-driver
-%{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so
-%endif
-
%if %{with_libxl}
%files daemon-driver-libxl
@@ -1610,12 +1552,6 @@
%doc %{_docdir}/%{name}/libvirt-daemon-lxc.README
%endif
-%if %{with_uml}
-
-%files daemon-uml
-%doc %{_docdir}/%{name}/libvirt-daemon-uml.README
-%endif
-
%if %{with_libxl}
%files daemon-xen
@@ -1637,6 +1573,9 @@
%{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate
+%if %{with_bash_completion}
+%{_datadir}/bash-completion/completions/virsh
+%endif
%dir %{_libdir}/%{name}
%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
%{_fillupdir}/sysconfig.libvirt-guests
++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.339616336 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.339616336 +0100
@@ -18,10 +18,10 @@
create mode 100644 src/conf/domain_stats.c
create mode 100644 src/conf/domain_stats.h
-Index: libvirt-4.10.0/src/conf/domain_stats.c
+Index: libvirt-5.0.0/src/conf/domain_stats.c
===================================================================
--- /dev/null
-+++ libvirt-4.10.0/src/conf/domain_stats.c
++++ libvirt-5.0.0/src/conf/domain_stats.c
@@ -0,0 +1,139 @@
+/*
+ * domain_stats.c: domain stats extraction helpers
@@ -162,10 +162,10 @@
+}
+
+#undef STATS_ADD_NET_PARAM
-Index: libvirt-4.10.0/src/conf/domain_stats.h
+Index: libvirt-5.0.0/src/conf/domain_stats.h
===================================================================
--- /dev/null
-+++ libvirt-4.10.0/src/conf/domain_stats.h
++++ libvirt-5.0.0/src/conf/domain_stats.h
@@ -0,0 +1,64 @@
+/*
+ * domain_stats.h: domain stats extraction helpers
@@ -231,11 +231,11 @@
+ int *maxparams);
+
+#endif /* __DOMAIN_STATS_H */
-Index: libvirt-4.10.0/src/libvirt_private.syms
+Index: libvirt-5.0.0/src/libvirt_private.syms
===================================================================
---- libvirt-4.10.0.orig/src/libvirt_private.syms
-+++ libvirt-4.10.0/src/libvirt_private.syms
-@@ -658,6 +658,9 @@ virDomainConfNWFilterInstantiate;
+--- libvirt-5.0.0.orig/src/libvirt_private.syms
++++ libvirt-5.0.0/src/libvirt_private.syms
+@@ -661,6 +661,9 @@ virDomainConfNWFilterInstantiate;
virDomainConfNWFilterTeardown;
virDomainConfVMNWFilterTeardown;
@@ -245,7 +245,7 @@
# conf/interface_conf.h
virInterfaceDefFormat;
-@@ -1547,6 +1550,7 @@ virCgroupGetMemoryUsage;
+@@ -1550,6 +1553,7 @@ virCgroupGetMemoryUsage;
virCgroupGetMemSwapHardLimit;
virCgroupGetMemSwapUsage;
virCgroupGetPercpuStats;
@@ -253,11 +253,11 @@
virCgroupHasController;
virCgroupHasEmptyTasks;
virCgroupKillPainfully;
-Index: libvirt-4.10.0/src/qemu/qemu_driver.c
+Index: libvirt-5.0.0/src/qemu/qemu_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-4.10.0/src/qemu/qemu_driver.c
-@@ -69,6 +69,7 @@
+--- libvirt-5.0.0.orig/src/qemu/qemu_driver.c
++++ libvirt-5.0.0/src/qemu/qemu_driver.c
+@@ -67,6 +67,7 @@
#include "virarptable.h"
#include "viruuid.h"
#include "domain_conf.h"
@@ -265,7 +265,7 @@
#include "domain_audit.h"
#include "node_device_conf.h"
#include "virpci.h"
-@@ -19908,21 +19909,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -19969,21 +19970,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
int *maxparams,
unsigned int privflags ATTRIBUTE_UNUSED)
{
@@ -288,7 +288,7 @@
}
-@@ -20112,37 +20099,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -20173,37 +20160,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
int *maxparams)
{
qemuDomainObjPrivatePtr priv = dom->privateData;
@@ -327,7 +327,7 @@
}
-@@ -20340,44 +20297,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -20401,44 +20358,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
return ret;
}
@@ -372,7 +372,7 @@
static int
qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
virDomainObjPtr dom,
-@@ -20385,68 +20304,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
+@@ -20446,68 +20365,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
int *maxparams,
unsigned int privflags ATTRIBUTE_UNUSED)
{
@@ -442,7 +442,7 @@
#define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \
do { \
char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
-@@ -20679,10 +20539,10 @@ qemuDomainGetStatsBlockExportHeader(virD
+@@ -20740,10 +20600,10 @@ qemuDomainGetStatsBlockExportHeader(virD
{
int ret = -1;
@@ -455,7 +455,7 @@
if (src->id)
QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex",
src->id);
-@@ -20822,7 +20682,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -20897,7 +20757,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
* after the iteration than it is to iterate twice; but we still
* want count listed first. */
count_index = record->nparams;
@@ -464,7 +464,7 @@
for (i = 0; i < dom->def->ndisks; i++) {
if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats,
-@@ -20847,8 +20707,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -20922,8 +20782,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
#undef QEMU_ADD_BLOCK_PARAM_ULL
@@ -473,7 +473,7 @@
#define QEMU_ADD_IOTHREAD_PARAM_UI(record, maxparams, id, name, value) \
do { \
char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
-@@ -20896,7 +20754,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver
+@@ -20975,7 +20833,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver
if (niothreads == 0)
return 0;
@@ -482,7 +482,7 @@
for (i = 0; i < niothreads; i++) {
if (iothreads[i]->poll_valid) {
-@@ -20929,8 +20787,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver
+@@ -21008,8 +20866,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver
#undef QEMU_ADD_IOTHREAD_PARAM_ULL
@@ -491,11 +491,11 @@
static int
qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
virPerfEventType type,
-Index: libvirt-4.10.0/src/util/vircgroup.c
+Index: libvirt-5.0.0/src/util/vircgroup.c
===================================================================
---- libvirt-4.10.0.orig/src/util/vircgroup.c
-+++ libvirt-4.10.0/src/util/vircgroup.c
-@@ -2794,6 +2794,44 @@ virCgroupControllerAvailable(int control
+--- libvirt-5.0.0.orig/src/util/vircgroup.c
++++ libvirt-5.0.0/src/util/vircgroup.c
+@@ -2796,6 +2796,44 @@ virCgroupControllerAvailable(int control
return ret;
}
@@ -540,7 +540,7 @@
#else /* !__linux__ */
bool
-@@ -2803,6 +2841,15 @@ virCgroupAvailable(void)
+@@ -2805,6 +2843,15 @@ virCgroupAvailable(void)
}
@@ -556,11 +556,11 @@
int
virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
bool create ATTRIBUTE_UNUSED,
-Index: libvirt-4.10.0/src/util/vircgroup.h
+Index: libvirt-5.0.0/src/util/vircgroup.h
===================================================================
---- libvirt-4.10.0.orig/src/util/vircgroup.h
-+++ libvirt-4.10.0/src/util/vircgroup.h
-@@ -287,4 +287,9 @@ int virCgroupSetOwner(virCgroupPtr cgrou
+--- libvirt-5.0.0.orig/src/util/vircgroup.h
++++ libvirt-5.0.0/src/util/vircgroup.h
+@@ -284,4 +284,9 @@ int virCgroupSetOwner(virCgroupPtr cgrou
int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
bool virCgroupControllerAvailable(int controller);
@@ -569,11 +569,11 @@
+ virDomainStatsRecordPtr record,
+ int *maxparams);
+
- #endif /* __VIR_CGROUP_H__ */
-Index: libvirt-4.10.0/src/conf/Makefile.inc.am
+ #endif /* LIBVIRT_VIRCGROUP_H */
+Index: libvirt-5.0.0/src/conf/Makefile.inc.am
===================================================================
---- libvirt-4.10.0.orig/src/conf/Makefile.inc.am
-+++ libvirt-4.10.0/src/conf/Makefile.inc.am
+--- libvirt-5.0.0.orig/src/conf/Makefile.inc.am
++++ libvirt-5.0.0/src/conf/Makefile.inc.am
@@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \
conf/domain_audit.h \
conf/domain_nwfilter.c \
++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.343616335 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.347616334 +0100
@@ -19,11 +19,11 @@
src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 91 insertions(+)
-Index: libvirt-4.10.0/src/libxl/libxl_driver.c
+Index: libvirt-5.0.0/src/libxl/libxl_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.10.0/src/libxl/libxl_driver.c
-@@ -5253,6 +5253,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-5.0.0.orig/src/libxl/libxl_driver.c
++++ libvirt-5.0.0/src/libxl/libxl_driver.c
+@@ -5252,6 +5252,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
#undef LIBXL_SET_MEMSTAT
@@ -121,7 +121,7 @@
static int
libxlDomainGetJobInfo(virDomainPtr dom,
virDomainJobInfoPtr info)
-@@ -6637,6 +6728,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6636,6 +6727,7 @@ static virHypervisorDriver libxlHypervis
#endif
.nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
.nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.351616333 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.351616333 +0100
@@ -9,11 +9,11 @@
src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 138 insertions(+)
-Index: libvirt-4.10.0/src/lxc/lxc_driver.c
+Index: libvirt-5.0.0/src/lxc/lxc_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-4.10.0/src/lxc/lxc_driver.c
-@@ -78,6 +78,7 @@
+--- libvirt-5.0.0.orig/src/lxc/lxc_driver.c
++++ libvirt-5.0.0/src/lxc/lxc_driver.c
+@@ -75,6 +75,7 @@
#include "viraccessapichecklxc.h"
#include "virhostdev.h"
#include "netdev_bandwidth_conf.h"
@@ -21,7 +21,7 @@
#define VIR_FROM_THIS VIR_FROM_LXC
-@@ -5410,6 +5411,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5408,6 +5409,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
return ret;
}
@@ -164,7 +164,7 @@
/* Function Tables */
static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5505,6 +5642,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5503,6 +5640,7 @@ static virHypervisorDriver lxcHypervisor
.nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
.nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
.domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */
++++++ 11c8aca9-libxl-set-mem-after-balloon.patch ++++++
commit 11c8aca938bff7f6b7fb9def732262f3ad9e91f9
Author: Jim Fehlig
Date: Thu Jan 10 15:18:36 2019 -0700
libxl: Set current memory value after successful balloon
The libxl driver does not set the new memory value in the active domain def
after a successful balloon. This results in the old memory value in
<currentMemory>. E.g.
virsh dumpxml test | grep currentMemory
<currentMemory unit='KiB'>20971520</currentMemory>
virsh setmem test 16777216 --live
virsh dumpxml test | grep currentMemory
<currentMemory unit='KiB'>20971520</currentMemory>
Set the new memory value in active domain def after a successful call to
libxl_set_memory_target().
Signed-off-by: Jim Fehlig
Reviewed-by: Ján Tomko
Index: libvirt-5.0.0/src/libxl/libxl_driver.c
===================================================================
--- libvirt-5.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.0.0/src/libxl/libxl_driver.c
@@ -1676,6 +1676,7 @@ libxlDomainSetMemoryFlags(virDomainPtr d
" with libxenlight"), vm->def->id);
goto endjob;
}
+ vm->def->mem.cur_balloon = newmem;
}
if (flags & VIR_DOMAIN_MEM_CONFIG) {
++++++ 70c2933d-apparmor-named-profiles.patch ++++++
commit 70c2933da24dc4b004118afe2f9acaeabc42c0ad
Author: Jim Fehlig
Date: Fri Jan 11 17:26:03 2019 -0700
apparmor: Add support for named profiles
Upstream apparmor is switching to named profiles. In short,
/usr/sbin/dnsmasq {
becomes
profile dnsmasq /usr/sbin/dnsmasq {
Consequently, any profiles that reference profiles in a peer= condition
need to be updated if the referenced profile switches to a named profile.
Apparmor commit 9ab45d81 switched dnsmasq to a named profile. ATM it is
the only named profile switch that has affected libvirt. Add rules to the
libvirtd profile to reference dnsmasq in peer= conditions by profile name.
Signed-off-by: Jim Fehlig
Index: libvirt-5.0.0/src/security/apparmor/usr.sbin.libvirtd
===================================================================
--- libvirt-5.0.0.orig/src/security/apparmor/usr.sbin.libvirtd
+++ libvirt-5.0.0/src/security/apparmor/usr.sbin.libvirtd
@@ -52,9 +52,11 @@
ptrace (read,trace) peer=unconfined,
ptrace (read,trace) peer=/usr/sbin/libvirtd,
+ ptrace (read,trace) peer=dnsmasq,
ptrace (read,trace) peer=/usr/sbin/dnsmasq,
ptrace (read,trace) peer=libvirt-*,
+ signal (send) peer=dnsmasq,
signal (send) peer=/usr/sbin/dnsmasq,
signal (read, send) peer=libvirt-*,
signal (send) set=("kill", "term") peer=unconfined,
++++++ a3ab6d42-apparmor-conv-libvirtd-named-profile.patch ++++++
commit a3ab6d42d825499af44b8f19f9299e150d9687bc
Author: Jim Fehlig
Date: Fri Jan 11 17:59:59 2019 -0700
apparmor: convert libvirtd profile to a named profile
Signed-off-by: Jim Fehlig
Index: libvirt-5.0.0/src/security/apparmor/usr.sbin.libvirtd
===================================================================
--- libvirt-5.0.0.orig/src/security/apparmor/usr.sbin.libvirtd
+++ libvirt-5.0.0/src/security/apparmor/usr.sbin.libvirtd
@@ -2,7 +2,7 @@
#include
@{LIBVIRT}="libvirt"
-/usr/sbin/libvirtd flags=(attach_disconnected) {
+profile libvirtd /usr/sbin/libvirtd flags=(attach_disconnected) {
#include
#include
@@ -51,7 +51,7 @@
unix (send, receive) type=stream addr=none peer=(label=unconfined addr=none),
ptrace (read,trace) peer=unconfined,
- ptrace (read,trace) peer=/usr/sbin/libvirtd,
+ ptrace (read,trace) peer=@{profile_name},
ptrace (read,trace) peer=dnsmasq,
ptrace (read,trace) peer=/usr/sbin/dnsmasq,
ptrace (read,trace) peer=libvirt-*,
@@ -123,6 +123,7 @@
# For communication/control from libvirtd
unix (send, receive) type=stream addr=none peer=(label=/usr/sbin/libvirtd),
signal (receive) set=("term") peer=/usr/sbin/libvirtd,
+ signal (receive) set=("term") peer=libvirtd,
/dev/net/tun rw,
/etc/qemu/** r,
++++++ apparmor-no-mount.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.367616329 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.367616329 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-4.10.0/examples/apparmor/libvirt-lxc
+Index: libvirt-5.0.0/src/security/apparmor/libvirt-lxc
===================================================================
---- libvirt-4.10.0.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-4.10.0/examples/apparmor/libvirt-lxc
+--- libvirt-5.0.0.orig/src/security/apparmor/libvirt-lxc
++++ libvirt-5.0.0/src/security/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
#include
++++++ blockcopy-check-dst-identical-device.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.379616326 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.383616325 +0100
@@ -11,11 +11,11 @@
src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
-Index: libvirt-4.10.0/src/qemu/qemu_driver.c
+Index: libvirt-5.0.0/src/qemu/qemu_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-4.10.0/src/qemu/qemu_driver.c
-@@ -17737,6 +17737,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+--- libvirt-5.0.0.orig/src/qemu/qemu_driver.c
++++ libvirt-5.0.0/src/qemu/qemu_driver.c
+@@ -17798,6 +17798,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
goto endjob;
}
++++++ libvirt-4.10.0.tar.xz -> libvirt-5.0.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-4.10.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.28833/libvirt-5.0.0.tar.xz differ: char 15, line 1
++++++ libvirt-power8-models.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.427616314 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.431616313 +0100
@@ -2,10 +2,10 @@
From:
-Index: libvirt-4.10.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-5.0.0/src/cpu_map/ppc64_POWER8.xml
===================================================================
---- libvirt-4.10.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-4.10.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-5.0.0.orig/src/cpu_map/ppc64_POWER8.xml
++++ libvirt-5.0.0/src/cpu_map/ppc64_POWER8.xml
@@ -4,5 +4,7 @@
<pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/>
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.475616302 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.475616302 +0100
@@ -1,8 +1,8 @@
-Index: libvirt-4.10.0/configure.ac
+Index: libvirt-5.0.0/configure.ac
===================================================================
---- libvirt-4.10.0.orig/configure.ac
-+++ libvirt-4.10.0/configure.ac
-@@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH
+--- libvirt-5.0.0.orig/configure.ac
++++ libvirt-5.0.0/configure.ac
+@@ -255,6 +255,7 @@ LIBVIRT_ARG_LIBSSH
LIBVIRT_ARG_LIBXML
LIBVIRT_ARG_MACVTAP
LIBVIRT_ARG_NETCF
@@ -10,7 +10,7 @@
LIBVIRT_ARG_NLS
LIBVIRT_ARG_NSS
LIBVIRT_ARG_NUMACTL
-@@ -299,6 +300,7 @@ LIBVIRT_CHECK_LIBSSH
+@@ -298,6 +299,7 @@ LIBVIRT_CHECK_LIBSSH
LIBVIRT_CHECK_LIBXML
LIBVIRT_CHECK_MACVTAP
LIBVIRT_CHECK_NETCF
@@ -18,7 +18,7 @@
LIBVIRT_CHECK_NLS
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_NWFILTER
-@@ -1016,6 +1018,7 @@ LIBVIRT_RESULT_LIBXL
+@@ -1012,6 +1014,7 @@ LIBVIRT_RESULT_LIBXL
LIBVIRT_RESULT_LIBXML
LIBVIRT_RESULT_MACVTAP
LIBVIRT_RESULT_NETCF
@@ -26,11 +26,11 @@
LIBVIRT_RESULT_NLS
LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL
-Index: libvirt-4.10.0/tools/virsh.c
+Index: libvirt-5.0.0/tools/virsh.c
===================================================================
---- libvirt-4.10.0.orig/tools/virsh.c
-+++ libvirt-4.10.0/tools/virsh.c
-@@ -570,6 +570,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
+--- libvirt-5.0.0.orig/tools/virsh.c
++++ libvirt-5.0.0/tools/virsh.c
+@@ -563,6 +563,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@@ -39,11 +39,11 @@
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
-Index: libvirt-4.10.0/src/interface/interface_backend_netcf.c
+Index: libvirt-5.0.0/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-4.10.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-4.10.0/src/interface/interface_backend_netcf.c
-@@ -23,7 +23,12 @@
+--- libvirt-5.0.0.orig/src/interface/interface_backend_netcf.c
++++ libvirt-5.0.0/src/interface/interface_backend_netcf.c
+@@ -21,7 +21,12 @@
#include
@@ -57,7 +57,7 @@
#include "virerror.h"
#include "datatypes.h"
-@@ -65,6 +70,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState
+@@ -63,6 +68,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState
static virNetcfDriverStatePtr driver;
@@ -95,7 +95,7 @@
static void
virNetcfDriverStateDispose(void *obj)
-@@ -89,6 +125,10 @@ netcfStateInitialize(bool privileged,
+@@ -87,6 +123,10 @@ netcfStateInitialize(bool privileged,
driver->privileged = privileged;
@@ -106,7 +106,7 @@
/* open netcf */
if (ncf_init(&driver->netcf, NULL) != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1225,6 +1265,19 @@ static virStateDriver interfaceStateDriv
+@@ -1223,6 +1263,19 @@ static virStateDriver interfaceStateDriv
int netcfIfaceRegister(void)
{
@@ -126,10 +126,10 @@
if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
return -1;
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-4.10.0/src/interface/interface_driver.c
+Index: libvirt-5.0.0/src/interface/interface_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/interface/interface_driver.c
-+++ libvirt-4.10.0/src/interface/interface_driver.c
+--- libvirt-5.0.0.orig/src/interface/interface_driver.c
++++ libvirt-5.0.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0)
return 0;
@@ -147,10 +147,10 @@
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
-Index: libvirt-4.10.0/m4/virt-netcontrol.m4
+Index: libvirt-5.0.0/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-4.10.0/m4/virt-netcontrol.m4
++++ libvirt-5.0.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@
+dnl The libnetcontrol library
+dnl
@@ -191,10 +191,10 @@
+AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
+ LIBVIRT_RESULT_LIB([NETCONTROL])
+])
-Index: libvirt-4.10.0/src/interface/Makefile.inc.am
+Index: libvirt-5.0.0/src/interface/Makefile.inc.am
===================================================================
---- libvirt-4.10.0.orig/src/interface/Makefile.inc.am
-+++ libvirt-4.10.0/src/interface/Makefile.inc.am
+--- libvirt-5.0.0.orig/src/interface/Makefile.inc.am
++++ libvirt-5.0.0/src/interface/Makefile.inc.am
@@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \
$(NULL)
++++++ libxl-dom-reset.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.523616290 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.523616290 +0100
@@ -8,11 +8,11 @@
option, but domainReset can be implemented in the libxl driver by
forcibly destroying the domain and starting it again.
-Index: libvirt-4.10.0/src/libxl/libxl_driver.c
+Index: libvirt-5.0.0/src/libxl/libxl_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.10.0/src/libxl/libxl_driver.c
-@@ -1355,6 +1355,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-5.0.0.orig/src/libxl/libxl_driver.c
++++ libvirt-5.0.0/src/libxl/libxl_driver.c
+@@ -1350,6 +1350,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
}
static int
@@ -74,7 +74,7 @@
libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags)
{
-@@ -6512,6 +6567,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6511,6 +6566,7 @@ static virHypervisorDriver libxlHypervis
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
.domainReboot = libxlDomainReboot, /* 0.9.0 */
++++++ libxl-set-cach-mode.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.535616288 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.535616288 +0100
@@ -3,11 +3,11 @@
src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
-Index: libvirt-4.10.0/src/libxl/libxl_conf.c
+Index: libvirt-5.0.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-4.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-4.10.0/src/libxl/libxl_conf.c
-@@ -888,6 +888,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-5.0.0.orig/src/libxl/libxl_conf.c
++++ libvirt-5.0.0/src/libxl/libxl_conf.c
+@@ -884,6 +884,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif
}
@@ -38,7 +38,7 @@
static char *
libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
const char *username,
-@@ -1136,6 +1160,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1132,6 +1156,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
return -1;
++++++ libxl-set-migration-constraints.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.543616286 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.543616286 +0100
@@ -16,11 +16,11 @@
tools/virsh.pod | 8 ++++++++
6 files changed, 125 insertions(+), 6 deletions(-)
-Index: libvirt-4.10.0/include/libvirt/libvirt-domain.h
+Index: libvirt-5.0.0/include/libvirt/libvirt-domain.h
===================================================================
---- libvirt-4.10.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-4.10.0/include/libvirt/libvirt-domain.h
-@@ -1017,6 +1017,31 @@ typedef enum {
+--- libvirt-5.0.0.orig/include/libvirt/libvirt-domain.h
++++ libvirt-5.0.0/include/libvirt/libvirt-domain.h
+@@ -1016,6 +1016,31 @@ typedef enum {
*/
# define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment"
@@ -52,11 +52,11 @@
/* Domain migration. */
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
unsigned long flags, const char *dname,
-Index: libvirt-4.10.0/src/libxl/libxl_driver.c
+Index: libvirt-5.0.0/src/libxl/libxl_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.10.0/src/libxl/libxl_driver.c
-@@ -6119,6 +6119,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-5.0.0.orig/src/libxl/libxl_driver.c
++++ libvirt-5.0.0/src/libxl/libxl_driver.c
+@@ -6118,6 +6118,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL;
const char *uri = NULL;
int ret = -1;
@@ -66,7 +66,7 @@
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError();
-@@ -6135,6 +6138,18 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6134,6 +6137,18 @@ libxlDomainMigratePerform3Params(virDoma
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_NAME,
&dname) < 0 ||
@@ -85,7 +85,7 @@
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI,
&uri) < 0)
-@@ -6149,11 +6164,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6148,11 +6163,11 @@ libxlDomainMigratePerform3Params(virDoma
if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@@ -99,11 +99,11 @@
goto cleanup;
}
-Index: libvirt-4.10.0/src/libxl/libxl_migration.c
+Index: libvirt-5.0.0/src/libxl/libxl_migration.c
===================================================================
---- libvirt-4.10.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-4.10.0/src/libxl/libxl_migration.c
-@@ -346,18 +346,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
+--- libvirt-5.0.0.orig/src/libxl/libxl_migration.c
++++ libvirt-5.0.0/src/libxl/libxl_migration.c
+@@ -342,18 +342,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
static int
libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
virDomainObjPtr vm,
@@ -145,7 +145,7 @@
if (ret != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to send migration data to destination host"));
-@@ -917,7 +938,7 @@ struct libxlTunnelControl {
+@@ -913,7 +934,7 @@ struct libxlTunnelControl {
static int
libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver,
virDomainObjPtr vm,
@@ -154,7 +154,7 @@
virStreamPtr st,
struct libxlTunnelControl **tnl)
{
-@@ -950,7 +971,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
+@@ -946,7 +967,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
virObjectUnlock(vm);
/* Send data to pipe */
@@ -163,7 +163,7 @@
virObjectLock(vm);
out:
-@@ -986,7 +1007,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -982,7 +1003,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
const char *dconnuri ATTRIBUTE_UNUSED,
const char *dname,
const char *uri,
@@ -172,9 +172,9 @@
{
virDomainPtr ddomain = NULL;
virTypedParameterPtr params = NULL;
-@@ -1031,11 +1052,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1027,11 +1048,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
/* We don't require the destination to have P2P support
- * as it looks to be normal migration from the receiver perpective.
+ * as it looks to be normal migration from the receiver perspective.
*/
- destflags = flags & ~(VIR_MIGRATE_PEER2PEER);
+ destflags = props->virFlags & ~(VIR_MIGRATE_PEER2PEER);
@@ -186,7 +186,7 @@
if (!(st = virStreamNew(dconn, 0)))
goto confirm;
ret = dconn->driver->domainMigratePrepareTunnel3Params
-@@ -1049,7 +1070,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1045,7 +1066,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
if (ret == -1)
goto confirm;
@@ -195,7 +195,7 @@
if (uri_out) {
if (virTypedParamsReplaceString(¶ms, &nparams,
VIR_MIGRATE_PARAM_URI, uri_out) < 0) {
-@@ -1064,11 +1085,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1060,11 +1081,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
}
VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
@@ -210,7 +210,7 @@
if (ret < 0) {
notify_source = false;
orig_err = virSaveLastError();
-@@ -1103,7 +1124,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1099,7 +1120,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
confirm:
if (notify_source) {
VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@@ -219,7 +219,7 @@
if (ret < 0)
VIR_WARN("Guest %s probably left in 'paused' state on source",
-@@ -1111,7 +1132,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1107,7 +1128,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
}
cleanup:
@@ -228,7 +228,7 @@
libxlMigrationSrcStopTunnel(tc);
virObjectUnref(st);
}
-@@ -1158,7 +1179,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1154,7 +1175,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
const char *dconnuri,
const char *uri_str ATTRIBUTE_UNUSED,
const char *dname,
@@ -237,7 +237,7 @@
{
int ret = -1;
bool useParams;
-@@ -1193,7 +1214,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1189,7 +1210,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
}
ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@@ -246,7 +246,7 @@
if (ret < 0) {
/*
-@@ -1223,7 +1244,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1219,7 +1240,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
const char *dconnuri ATTRIBUTE_UNUSED,
const char *uri_str,
const char *dname ATTRIBUTE_UNUSED,
@@ -255,7 +255,7 @@
{
libxlDomainObjPrivatePtr priv = vm->privateData;
char *hostname = NULL;
-@@ -1263,7 +1284,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1259,7 +1280,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
/* suspend vm and send saved data to dst through socket fd */
virObjectUnlock(vm);
@@ -264,11 +264,11 @@
virObjectLock(vm);
if (ret < 0) {
-Index: libvirt-4.10.0/src/libxl/libxl_migration.h
+Index: libvirt-5.0.0/src/libxl/libxl_migration.h
===================================================================
---- libvirt-4.10.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-4.10.0/src/libxl/libxl_migration.h
-@@ -39,6 +39,10 @@
+--- libvirt-5.0.0.orig/src/libxl/libxl_migration.h
++++ libvirt-5.0.0/src/libxl/libxl_migration.h
+@@ -36,6 +36,10 @@
VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \
VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \
VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \
@@ -279,7 +279,7 @@
NULL
char *
-@@ -70,6 +74,14 @@ libxlDomainMigrationDstPrepare(virConnec
+@@ -67,6 +71,14 @@ libxlDomainMigrationDstPrepare(virConnec
int cookieinlen,
unsigned int flags);
@@ -294,7 +294,7 @@
int
libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver,
virDomainObjPtr vm,
-@@ -78,7 +90,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -75,7 +87,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
const char *dconnuri,
const char *uri_str,
const char *dname,
@@ -303,7 +303,7 @@
int
libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver,
-@@ -87,7 +99,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -84,7 +96,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
const char *dconnuri,
const char *uri_str,
const char *dname,
@@ -312,11 +312,11 @@
virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-4.10.0/tools/virsh-domain.c
+Index: libvirt-5.0.0/tools/virsh-domain.c
===================================================================
---- libvirt-4.10.0.orig/tools/virsh-domain.c
-+++ libvirt-4.10.0/tools/virsh-domain.c
-@@ -10554,6 +10554,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-5.0.0.orig/tools/virsh-domain.c
++++ libvirt-5.0.0/tools/virsh-domain.c
+@@ -10558,6 +10558,22 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_BOOL,
.help = N_("use TLS for migration")
},
@@ -339,7 +339,7 @@
{.name = NULL}
};
-@@ -10577,6 +10593,7 @@ doMigrate(void *opaque)
+@@ -10581,6 +10597,7 @@ doMigrate(void *opaque)
unsigned long long ullOpt = 0;
int rv;
virConnectPtr dconn = data->dconn;
@@ -347,7 +347,7 @@
sigemptyset(&sigmask);
sigaddset(&sigmask, SIGINT);
-@@ -10696,6 +10713,27 @@ doMigrate(void *opaque)
+@@ -10700,6 +10717,27 @@ doMigrate(void *opaque)
goto save_error;
}
@@ -375,10 +375,10 @@
if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
goto out;
if (opt) {
-Index: libvirt-4.10.0/tools/virsh.pod
+Index: libvirt-5.0.0/tools/virsh.pod
===================================================================
---- libvirt-4.10.0.orig/tools/virsh.pod
-+++ libvirt-4.10.0/tools/virsh.pod
+--- libvirt-5.0.0.orig/tools/virsh.pod
++++ libvirt-5.0.0/tools/virsh.pod
@@ -1994,6 +1994,14 @@ Providing I<--tls> causes the migration
the migration of the domain. Usage requires proper TLS setup for both source
and target.
++++++ libxl-support-block-script.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.551616284 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.551616284 +0100
@@ -7,11 +7,11 @@
For more details, see bsc#954872 and FATE#319810
-Index: libvirt-4.10.0/src/libxl/libxl_conf.c
+Index: libvirt-5.0.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-4.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-4.10.0/src/libxl/libxl_conf.c
-@@ -888,6 +888,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-5.0.0.orig/src/libxl/libxl_conf.c
++++ libvirt-5.0.0/src/libxl/libxl_conf.c
+@@ -884,6 +884,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif
}
@@ -37,7 +37,7 @@
static void
libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
{
-@@ -1033,6 +1052,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -1029,6 +1048,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
int
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
{
@@ -45,7 +45,7 @@
const char *driver = virDomainDiskGetDriver(l_disk);
int format = virDomainDiskGetFormat(l_disk);
int actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -1048,7 +1068,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1044,7 +1064,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1;
} else {
@@ -54,7 +54,7 @@
return -1;
}
-@@ -1161,6 +1181,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1157,6 +1177,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
return -1;
libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
++++++ lxc-wait-after-eth-del.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.559616282 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.559616282 +0100
@@ -13,11 +13,11 @@
src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+)
-Index: libvirt-4.10.0/src/lxc/lxc_controller.c
+Index: libvirt-5.0.0/src/lxc/lxc_controller.c
===================================================================
---- libvirt-4.10.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-4.10.0/src/lxc/lxc_controller.c
-@@ -72,6 +72,7 @@
+--- libvirt-5.0.0.orig/src/lxc/lxc_controller.c
++++ libvirt-5.0.0/src/lxc/lxc_controller.c
+@@ -69,6 +69,7 @@
#include "rpc/virnetdaemon.h"
#include "virstring.h"
#include "virgettext.h"
@@ -25,7 +25,7 @@
#define VIR_FROM_THIS VIR_FROM_LXC
-@@ -1998,6 +1999,7 @@ static int virLXCControllerDeleteInterfa
+@@ -2016,6 +2017,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1;
}
@@ -33,11 +33,11 @@
return ret;
}
-Index: libvirt-4.10.0/src/lxc/lxc_driver.c
+Index: libvirt-5.0.0/src/lxc/lxc_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-4.10.0/src/lxc/lxc_driver.c
-@@ -73,6 +73,7 @@
+--- libvirt-5.0.0.orig/src/lxc/lxc_driver.c
++++ libvirt-5.0.0/src/lxc/lxc_driver.c
+@@ -70,6 +70,7 @@
#include "virtime.h"
#include "virtypedparam.h"
#include "viruri.h"
@@ -45,7 +45,7 @@
#include "virstring.h"
#include "viraccessapicheck.h"
#include "viraccessapichecklxc.h"
-@@ -3944,6 +3945,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
+@@ -3942,6 +3943,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET:
ignore_value(virNetDevVethDelete(veth));
@@ -53,7 +53,7 @@
break;
case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -4387,6 +4389,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -4385,6 +4387,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
virDomainAuditNet(vm, detach, NULL, "detach", false);
goto cleanup;
}
@@ -61,10 +61,10 @@
break;
/* It'd be nice to support this, but with macvlan
-Index: libvirt-4.10.0/src/lxc/lxc_process.c
+Index: libvirt-5.0.0/src/lxc/lxc_process.c
===================================================================
---- libvirt-4.10.0.orig/src/lxc/lxc_process.c
-+++ libvirt-4.10.0/src/lxc/lxc_process.c
+--- libvirt-5.0.0.orig/src/lxc/lxc_process.c
++++ libvirt-5.0.0/src/lxc/lxc_process.c
@@ -51,6 +51,7 @@
#include "viratomic.h"
#include "virprocess.h"
++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.575616278 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.575616278 +0100
@@ -17,11 +17,11 @@
tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
2 files changed, 8 insertions(+), 2 deletions(-)
-Index: libvirt-4.10.0/src/network/bridge_driver.c
+Index: libvirt-5.0.0/src/network/bridge_driver.c
===================================================================
---- libvirt-4.10.0.orig/src/network/bridge_driver.c
-+++ libvirt-4.10.0/src/network/bridge_driver.c
-@@ -1458,7 +1458,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-5.0.0.orig/src/network/bridge_driver.c
++++ libvirt-5.0.0/src/network/bridge_driver.c
+@@ -1456,7 +1456,14 @@ networkDnsmasqConfContents(virNetworkObj
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) {
virBufferAddLit(&configbuf, "dhcp-no-override\n");
@@ -37,10 +37,10 @@
}
if (ipdef->tftproot) {
-Index: libvirt-4.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-5.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
===================================================================
---- libvirt-4.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-4.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-5.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
++++ libvirt-5.0.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.QYesmc/_old 2019-02-04 21:24:00.587616275 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.591616274 +0100
@@ -2,10 +2,10 @@
See bnc#894956
-Index: libvirt-4.10.0/src/util/virarch.c
+Index: libvirt-5.0.0/src/util/virarch.c
===================================================================
---- libvirt-4.10.0.orig/src/util/virarch.c
-+++ libvirt-4.10.0/src/util/virarch.c
+--- libvirt-5.0.0.orig/src/util/virarch.c
++++ libvirt-5.0.0/src/util/virarch.c
@@ -172,6 +172,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) {
++++++ qemu-apparmor-screenshot.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.611616269 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.611616269 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-4.10.0/examples/apparmor/libvirt-qemu
+Index: libvirt-5.0.0/src/security/apparmor/libvirt-qemu
===================================================================
---- libvirt-4.10.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-4.10.0/examples/apparmor/libvirt-qemu
+--- libvirt-5.0.0.orig/src/security/apparmor/libvirt-qemu
++++ libvirt-5.0.0/src/security/apparmor/libvirt-qemu
@@ -221,3 +221,6 @@
# required for sasl GSSAPI plugin
/etc/gss/mech.d/ r,
++++++ support-managed-pci-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.619616267 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.623616266 +0100
@@ -8,11 +8,11 @@
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
-Index: libvirt-4.10.0/src/xenconfig/xen_common.c
+Index: libvirt-5.0.0/src/xenconfig/xen_common.c
===================================================================
---- libvirt-4.10.0.orig/src/xenconfig/xen_common.c
-+++ libvirt-4.10.0/src/xenconfig/xen_common.c
-@@ -390,12 +390,19 @@ xenParsePCI(char *entry)
+--- libvirt-5.0.0.orig/src/xenconfig/xen_common.c
++++ libvirt-5.0.0/src/xenconfig/xen_common.c
+@@ -386,12 +386,19 @@ xenParsePCI(char *entry)
int busID;
int slotID;
int funcID;
@@ -32,7 +32,7 @@
if (!(nextkey = strchr(key, ':')))
return NULL;
if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) {
-@@ -440,10 +447,30 @@ xenParsePCI(char *entry)
+@@ -436,10 +443,30 @@ xenParsePCI(char *entry)
if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
return NULL;
@@ -64,11 +64,11 @@
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-4.10.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-5.0.0/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-4.10.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.10.0/src/xenconfig/xen_sxpr.c
-@@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def,
+--- libvirt-5.0.0.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-5.0.0/src/xenconfig/xen_sxpr.c
+@@ -1053,6 +1053,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
int funcID;
@@ -76,7 +76,7 @@
node = cur->u.s.car;
if (!sexpr_lookup(node, "dev"))
-@@ -1104,11 +1105,13 @@ xenParseSxprPCI(virDomainDefPtr def,
+@@ -1100,11 +1101,13 @@ xenParseSxprPCI(virDomainDefPtr def,
goto error;
}
@@ -91,7 +91,7 @@
dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
dev->source.subsys.u.pci.addr.domain = domainID;
dev->source.subsys.u.pci.addr.bus = busID;
-@@ -1972,11 +1975,15 @@ static void
+@@ -1968,11 +1971,15 @@ static void
xenFormatSxprPCI(virDomainHostdevDefPtr def,
virBufferPtr buf)
{
@@ -108,7 +108,7 @@
}
-@@ -1995,12 +2002,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
+@@ -1991,12 +1998,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
virBufferPtr buf,
int detach)
{
@@ -121,7 +121,7 @@
virBufferAddLit(buf, "(pci ");
xenFormatSxprPCI(def, buf);
if (detach)
-@@ -2055,12 +2056,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
+@@ -2051,12 +2052,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
++++++ suse-apparmor-libnl-paths.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.631616264 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.631616264 +0100
@@ -8,10 +8,22 @@
to squelch a denial when starting confined domains.
Found while investigating bsc#1058847
-Index: libvirt-4.10.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-5.0.0/src/security/apparmor/libvirt-qemu
===================================================================
---- libvirt-4.10.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ libvirt-4.10.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-5.0.0.orig/src/security/apparmor/libvirt-qemu
++++ libvirt-5.0.0/src/security/apparmor/libvirt-qemu
+@@ -62,6 +62,7 @@
+ #/dev/fb* rw,
+
+ /etc/pulse/client.conf r,
++ /etc/libnl*/classid r,
+ @{HOME}/.pulse-cookie rwk,
+ owner /root/.pulse-cookie rwk,
+ owner /root/.pulse/ rw,
+Index: libvirt-5.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+===================================================================
+--- libvirt-5.0.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
++++ libvirt-5.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/
owner @{PROC}/[0-9]*/status r,
@{PROC}/filesystems r,
@@ -21,15 +33,3 @@
# for hostdev
/sys/devices/ r,
-Index: libvirt-4.10.0/examples/apparmor/libvirt-qemu
-===================================================================
---- libvirt-4.10.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-4.10.0/examples/apparmor/libvirt-qemu
-@@ -62,6 +62,7 @@
- #/dev/fb* rw,
-
- /etc/pulse/client.conf r,
-+ /etc/libnl*/classid r,
- @{HOME}/.pulse-cookie rwk,
- owner /root/.pulse-cookie rwk,
- owner /root/.pulse/ rw,
++++++ suse-libvirt-guests-service.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.647616261 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.647616261 +0100
@@ -1,9 +1,9 @@
Adjust libvirt-guests service to conform to SUSE standards
-Index: libvirt-4.10.0/tools/libvirt-guests.init.in
+Index: libvirt-5.0.0/tools/libvirt-guests.init.in
===================================================================
---- libvirt-4.10.0.orig/tools/libvirt-guests.init.in
-+++ libvirt-4.10.0/tools/libvirt-guests.init.in
+--- libvirt-5.0.0.orig/tools/libvirt-guests.init.in
++++ libvirt-5.0.0/tools/libvirt-guests.init.in
@@ -4,27 +4,27 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-gene...
#
@@ -46,10 +46,10 @@
+
exec @libexecdir@/libvirt-guests.sh "$@"
-Index: libvirt-4.10.0/tools/libvirt-guests.sh.in
+Index: libvirt-5.0.0/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-4.10.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-4.10.0/tools/libvirt-guests.sh.in
+--- libvirt-5.0.0.orig/tools/libvirt-guests.sh.in
++++ libvirt-5.0.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
# License along with this library. If not, see
# http://www.gnu.org/licenses/.
@@ -209,10 +209,10 @@
esac
-exit $RETVAL
+rc_exit
-Index: libvirt-4.10.0/tools/libvirt-guests.sysconf
+Index: libvirt-5.0.0/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-4.10.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-4.10.0/tools/libvirt-guests.sysconf
+--- libvirt-5.0.0.orig/tools/libvirt-guests.sysconf
++++ libvirt-5.0.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
++++++ suse-libvirtd-disable-tls.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.659616257 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.659616257 +0100
@@ -3,10 +3,10 @@
On SUSE distros, the default is for libvirtd to listen only on the
Unix Domain Socket. The libvirt client still provides remote access
via a SSH tunnel.
-Index: libvirt-4.10.0/src/remote/libvirtd.conf
+Index: libvirt-5.0.0/src/remote/libvirtd.conf
===================================================================
---- libvirt-4.10.0.orig/src/remote/libvirtd.conf
-+++ libvirt-4.10.0/src/remote/libvirtd.conf
+--- libvirt-5.0.0.orig/src/remote/libvirtd.conf
++++ libvirt-5.0.0/src/remote/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@@ -18,11 +18,11 @@
# 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-4.10.0/src/remote/remote_daemon_config.c
+Index: libvirt-5.0.0/src/remote/remote_daemon_config.c
===================================================================
---- libvirt-4.10.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-4.10.0/src/remote/remote_daemon_config.c
-@@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT
+--- libvirt-5.0.0.orig/src/remote/remote_daemon_config.c
++++ libvirt-5.0.0/src/remote/remote_daemon_config.c
+@@ -108,7 +108,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
@@ -31,10 +31,10 @@
data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-4.10.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-5.0.0/src/remote/test_libvirtd.aug.in
===================================================================
---- libvirt-4.10.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-4.10.0/src/remote/test_libvirtd.aug.in
+--- libvirt-5.0.0.orig/src/remote/test_libvirtd.aug.in
++++ libvirt-5.0.0/src/remote/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::
++++++ suse-libvirtd-service-xen.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.663616256 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.667616255 +0100
@@ -7,10 +7,10 @@
tools. If a user installs libvirt on their SUSE Xen host, then
libvirt should be king and override xendomains. See bsc#1015348
-Index: libvirt-4.10.0/src/remote/libvirtd.service.in
+Index: libvirt-5.0.0/src/remote/libvirtd.service.in
===================================================================
---- libvirt-4.10.0.orig/src/remote/libvirtd.service.in
-+++ libvirt-4.10.0/src/remote/libvirtd.service.in
+--- libvirt-5.0.0.orig/src/remote/libvirtd.service.in
++++ libvirt-5.0.0/src/remote/libvirtd.service.in
@@ -17,6 +17,8 @@ After=local-fs.target
After=remote-fs.target
After=systemd-logind.service
++++++ suse-libvirtd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.671616254 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.671616254 +0100
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-4.10.0/src/remote/libvirtd.sysconf
+Index: libvirt-5.0.0/src/remote/libvirtd.sysconf
===================================================================
---- libvirt-4.10.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-4.10.0/src/remote/libvirtd.sysconf
+--- libvirt-5.0.0.orig/src/remote/libvirtd.sysconf
++++ libvirt-5.0.0/src/remote/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ suse-ovmf-paths.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.695616248 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.695616248 +0100
@@ -1,10 +1,10 @@
Adjust paths of OVMF firmwares on SUSE distros
-Index: libvirt-4.10.0/src/qemu/qemu.conf
+Index: libvirt-5.0.0/src/qemu/qemu.conf
===================================================================
---- libvirt-4.10.0.orig/src/qemu/qemu.conf
-+++ libvirt-4.10.0/src/qemu/qemu.conf
-@@ -768,10 +768,9 @@ security_default_confined = 0
+--- libvirt-5.0.0.orig/src/qemu/qemu.conf
++++ libvirt-5.0.0/src/qemu/qemu.conf
+@@ -767,10 +767,9 @@ security_default_confined = 0
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
# follows this scheme.
#nvram = [
@@ -18,11 +18,11 @@
#]
# The backend to use for handling stdout/stderr output from
-Index: libvirt-4.10.0/src/qemu/qemu_conf.c
+Index: libvirt-5.0.0/src/qemu/qemu_conf.c
===================================================================
---- libvirt-4.10.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-4.10.0/src/qemu/qemu_conf.c
-@@ -118,10 +118,9 @@ void qemuDomainCmdlineDefFree(qemuDomain
+--- libvirt-5.0.0.orig/src/qemu/qemu_conf.c
++++ libvirt-5.0.0/src/qemu/qemu_conf.c
+@@ -116,10 +116,9 @@ void qemuDomainCmdlineDefFree(qemuDomain
#ifndef DEFAULT_LOADER_NVRAM
# define DEFAULT_LOADER_NVRAM \
@@ -36,11 +36,11 @@
#endif
-Index: libvirt-4.10.0/src/security/virt-aa-helper.c
+Index: libvirt-5.0.0/src/security/virt-aa-helper.c
===================================================================
---- libvirt-4.10.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-4.10.0/src/security/virt-aa-helper.c
-@@ -511,7 +511,8 @@ valid_path(const char *path, const bool
+--- libvirt-5.0.0.orig/src/security/virt-aa-helper.c
++++ libvirt-5.0.0/src/security/virt-aa-helper.c
+@@ -507,7 +507,8 @@ valid_path(const char *path, const bool
"/usr/share/ovmf/", /* for OVMF images */
"/usr/share/AAVMF/", /* for AAVMF images */
"/usr/share/qemu-efi/", /* for AAVMF images */
++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.747616236 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.751616235 +0100
@@ -7,10 +7,10 @@
etc.), but for now they are all lumped together in this
single patch.
-Index: libvirt-4.10.0/src/qemu/qemu.conf
+Index: libvirt-5.0.0/src/qemu/qemu.conf
===================================================================
---- libvirt-4.10.0.orig/src/qemu/qemu.conf
-+++ libvirt-4.10.0/src/qemu/qemu.conf
+--- libvirt-5.0.0.orig/src/qemu/qemu.conf
++++ libvirt-5.0.0/src/qemu/qemu.conf
@@ -414,11 +414,20 @@
# isolation, but it cannot appear in a list of drivers.
#
@@ -34,7 +34,7 @@
# If set to non-zero, then attempts to create unconfined
# guests will be blocked. Defaults to 0.
-@@ -650,11 +659,22 @@
+@@ -649,11 +658,22 @@
#relaxed_acs_check = 1
++++++ suse-virtlockd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.771616230 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.771616230 +0100
@@ -1,9 +1,9 @@
Adjust virtlockd sysconfig file to conform to SUSE standards
-Index: libvirt-4.10.0/src/locking/virtlockd.sysconf
+Index: libvirt-5.0.0/src/locking/virtlockd.sysconf
===================================================================
---- libvirt-4.10.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-4.10.0/src/locking/virtlockd.sysconf
+--- libvirt-5.0.0.orig/src/locking/virtlockd.sysconf
++++ libvirt-5.0.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd
+
++++++ suse-virtlogd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.791616225 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.791616225 +0100
@@ -1,9 +1,9 @@
Adjust virtlogd sysconfig file to conform to SUSE standards
-Index: libvirt-4.10.0/src/logging/virtlogd.sysconf
+Index: libvirt-5.0.0/src/logging/virtlogd.sysconf
===================================================================
---- libvirt-4.10.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-4.10.0/src/logging/virtlogd.sysconf
+--- libvirt-5.0.0.orig/src/logging/virtlogd.sysconf
++++ libvirt-5.0.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlogd
+
++++++ virt-create-rootfs.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.795616224 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.795616224 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-4.10.0/tools/Makefile.am
+Index: libvirt-5.0.0/tools/Makefile.am
===================================================================
---- libvirt-4.10.0.orig/tools/Makefile.am
-+++ libvirt-4.10.0/tools/Makefile.am
+--- libvirt-5.0.0.orig/tools/Makefile.am
++++ libvirt-5.0.0/tools/Makefile.am
@@ -53,6 +53,7 @@ PODFILES = \
virt-sanlock-cleanup.pod \
virt-xml-validate.pod \
@@ -10,7 +10,7 @@
$(NULL)
MANINFILES = \
-@@ -87,7 +88,7 @@ MAINTAINERCLEANFILES =
+@@ -88,7 +89,7 @@ MAINTAINERCLEANFILES =
confdir = $(sysconfdir)/libvirt
conf_DATA =
@@ -19,7 +19,7 @@
bin_PROGRAMS = virsh virt-admin
libexec_SCRIPTS = libvirt-guests.sh
man1_MANS = \
-@@ -113,6 +114,8 @@ bin_PROGRAMS += virt-host-validate
+@@ -114,6 +115,8 @@ bin_PROGRAMS += virt-host-validate
man1_MANS += virt-host-validate.1
endif WITH_HOST_VALIDATE
@@ -28,10 +28,10 @@
virt-xml-validate: virt-xml-validate.in Makefile
$(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \
-e 's|[@]VERSION@|$(VERSION)|g' \
-Index: libvirt-4.10.0/tools/virt-create-rootfs
+Index: libvirt-5.0.0/tools/virt-create-rootfs
===================================================================
--- /dev/null
-+++ libvirt-4.10.0/tools/virt-create-rootfs
++++ libvirt-5.0.0/tools/virt-create-rootfs
@@ -0,0 +1,214 @@
+#!/bin/sh
+set -e
@@ -247,10 +247,10 @@
+ echo "pts/0" >> "$ROOT/etc/securetty"
+ chroot "$ROOT" /usr/bin/passwd
+fi
-Index: libvirt-4.10.0/tools/virt-create-rootfs.pod
+Index: libvirt-5.0.0/tools/virt-create-rootfs.pod
===================================================================
--- /dev/null
-+++ libvirt-4.10.0/tools/virt-create-rootfs.pod
++++ libvirt-5.0.0/tools/virt-create-rootfs.pod
@@ -0,0 +1,77 @@
+=head1 NAME
+
++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.803616222 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.803616222 +0100
@@ -1,8 +1,8 @@
-Index: libvirt-4.10.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-5.0.0/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-4.10.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.10.0/src/xenconfig/xen_sxpr.c
-@@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un
+--- libvirt-5.0.0.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-5.0.0/src/xenconfig/xen_sxpr.c
+@@ -383,7 +383,7 @@ xenParseSxprVifRate(const char *rate, un
static int
xenParseSxprDisks(virDomainDefPtr def,
const struct sexpr *root,
@@ -11,7 +11,7 @@
{
const struct sexpr *cur, *node;
virDomainDiskDefPtr disk = NULL;
-@@ -437,7 +437,6 @@ xenParseSxprDisks(virDomainDefPtr def,
+@@ -433,7 +433,6 @@ xenParseSxprDisks(virDomainDefPtr def,
/* There is a case without the uname to the CD-ROM device */
offset = strchr(dst, ':');
if (!offset ||
++++++ xen-sxpr-disk-type.patch ++++++
--- /var/tmp/diff_new_pack.QYesmc/_old 2019-02-04 21:24:00.807616221 +0100
+++ /var/tmp/diff_new_pack.QYesmc/_new 2019-02-04 21:24:00.807616221 +0100
@@ -6,11 +6,11 @@
https://bugzilla.suse.com/show_bug.cgi?id=938228
-Index: libvirt-4.10.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-5.0.0/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-4.10.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.10.0/src/xenconfig/xen_sxpr.c
-@@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def,
+--- libvirt-5.0.0.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-5.0.0/src/xenconfig/xen_sxpr.c
+@@ -497,10 +497,11 @@ xenParseSxprDisks(virDomainDefPtr def,
omnipotent, we can revisit this, perhaps stat()'ing
the src file in question */
virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);