From d1058d1ec0c019340e3fce8bfcdbe7fa9e601fe8fc62cd62fb5f3aaa8b603e34 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 13 Oct 2015 17:02:37 +0000 Subject: [PATCH 1/2] Add an old SLE12 bug fix to Factory/Tumbleweed OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=494 --- libvirt.changes | 7 +++++++ libvirt.spec | 10 ++++++---- xen-sxpr-disk-type.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 xen-sxpr-disk-type.patch diff --git a/libvirt.changes b/libvirt.changes index fd23f5e..4731556 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 13 15:13:38 UTC 2015 - jfehlig@suse.com + +- xenconfig: set disk type to BLOCK when driver is not tap or file + xen-sxpr-disk-type.patch + bsc#938228 + ------------------------------------------------------------------- Fri Oct 9 17:11:14 UTC 2015 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 6b17211..76a4f41 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -461,11 +461,12 @@ Patch203: virtlockd-init-script.patch Patch204: suse-qemu-conf.patch Patch205: support-managed-pci-xen-driver.patch Patch206: systemd-service-xen.patch +Patch207: xen-sxpr-disk-type.patch # Disable failing virCgroupGetPercpuStats unit test -Patch207: disable-virCgroupGetPercpuStats-test.patch -Patch208: apparmor-no-mount.patch -Patch209: qemu-apparmor-screenshot.patch -Patch210: libvirt-suse-netcontrol.patch +Patch208: disable-virCgroupGetPercpuStats-test.patch +Patch209: apparmor-no-mount.patch +Patch210: qemu-apparmor-screenshot.patch +Patch211: libvirt-suse-netcontrol.patch # SocketUser and SocketGroup settings were added to systemd.socket in # version 214. Patch the setting away in earlier systemd %if 0%{systemd_version} < 214 @@ -993,6 +994,7 @@ Provides a dissector for the libvirt RPC protocol to help debugging it. %patch208 -p1 %patch209 -p1 %patch210 -p1 +%patch211 -p1 %if 0%{systemd_version} < 214 %patch300 -p1 %endif diff --git a/xen-sxpr-disk-type.patch b/xen-sxpr-disk-type.patch new file mode 100644 index 0000000..3a8cd39 --- /dev/null +++ b/xen-sxpr-disk-type.patch @@ -0,0 +1,26 @@ +xen_sxpr: set disk type to BLOCK when driver is not tap or file + +When parsing disk s-expression to virDomainDiskDef structure, explicitly +set type to VIR_STORAGE_TYPE_BLOCK for all drivers except 'tap', 'tap2', +and 'file'. This was implicitly done prior to commit 9673418c. + +https://bugzilla.suse.com/show_bug.cgi?id=938228 + +Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c +=================================================================== +--- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c +@@ -449,10 +449,11 @@ xenParseSxprDisks(virDomainDefPtr def, + omnipotent, we can revisit this, perhaps stat()'ing + the src file in question */ + virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE); +- } else if (STREQ(virDomainDiskGetDriver(disk), "phy")) { +- virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK); + } else if (STREQ(virDomainDiskGetDriver(disk), "file")) { + virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE); ++ } else { ++ /* Set type to BLOCK for drivers != {tap,tap2,file} */ ++ virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK); + } + } else { + /* No CDROM media so can't really tell. We'll just From 048cb10d28b35f24b246a81cee29fa34ca3e36c063addbe0a1d63b5ca99d1b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Fri, 16 Oct 2015 09:13:56 +0000 Subject: [PATCH 2/2] Accepting request 339223 from home:cbosdonnat:branches:Virtualization - spec: remove all dependencies on apparmor to keep it optional. bsc#949793 OBS-URL: https://build.opensuse.org/request/show/339223 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=495 --- libvirt.changes | 6 ++++++ libvirt.spec | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libvirt.changes b/libvirt.changes index 4731556..79cfa1a 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 16 08:51:24 UTC 2015 - cbosdonnat@suse.com + +- spec: remove all dependencies on apparmor to keep it optional. + bsc#949793 + ------------------------------------------------------------------- Tue Oct 13 15:13:38 UTC 2015 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 76a4f41..1f209fb 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -516,10 +516,6 @@ Requires: modutils Requires: bridge-utils Requires: iproute Requires: logrotate - %if %{with_apparmor} -Requires: apparmor-parser -Requires: apparmor-profiles - %endif %if %{with_udev} Requires: udev >= 145