diff --git a/0b1ecf7b-virHashCodeGen-mockable.patch b/0b1ecf7b-virHashCodeGen-mockable.patch deleted file mode 100644 index 96ce2fe..0000000 --- a/0b1ecf7b-virHashCodeGen-mockable.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 0b1ecf7b5342f8631d1b1cce8a7937bda511be98 -Author: Peter Krempa -Date: Wed Aug 2 17:31:14 2017 +0200 - - util: hash: Make virHashCodeGen mockable - - Export the function from the util module so that dynamic linking can - override it. - -Index: libvirt-3.6.0/src/libvirt_private.syms -=================================================================== ---- libvirt-3.6.0.orig/src/libvirt_private.syms -+++ libvirt-3.6.0/src/libvirt_private.syms -@@ -1776,6 +1776,10 @@ virHashUpdateEntry; - virHashValueFree; - - -+# util/virhashcode.h -+virHashCodeGen; -+ -+ - # util/virhook.h - virHookCall; - virHookInitialize; -Index: libvirt-3.6.0/src/util/virhashcode.h -=================================================================== ---- libvirt-3.6.0.orig/src/util/virhashcode.h -+++ libvirt-3.6.0/src/util/virhashcode.h -@@ -30,6 +30,7 @@ - - # include "internal.h" - --uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); -+uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed) -+ ATTRIBUTE_NOINLINE; - - #endif /* __VIR_HASH_CODE_H__ */ diff --git a/8982f3ab-util-hash-header.patch b/8982f3ab-util-hash-header.patch deleted file mode 100644 index f43c627..0000000 --- a/8982f3ab-util-hash-header.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8982f3ab20194e23e34205c4165602a03ada8b56 -Author: Peter Krempa -Date: Wed Aug 2 17:28:55 2017 +0200 - - util: hash: Include stdbool.h in the header file - - The functions declared in virhash.h return bool, but stdbool.h was not - included. - -Index: libvirt-3.6.0/src/util/virhash.h -=================================================================== ---- libvirt-3.6.0.orig/src/util/virhash.h -+++ libvirt-3.6.0/src/util/virhash.h -@@ -14,6 +14,7 @@ - # define __VIR_HASH_H__ - - # include -+# include - - /* - * The hash table. diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index 8373193..2f364a8 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,7 +1,7 @@ -Index: libvirt-3.6.0/examples/apparmor/libvirt-qemu +Index: libvirt-3.7.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.6.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.6.0/examples/apparmor/libvirt-qemu +--- libvirt-3.7.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-3.7.0/examples/apparmor/libvirt-qemu @@ -156,6 +156,9 @@ # for restore /{usr/,}bin/bash rmix, diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index eceba28..5614ea4 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-3.6.0/examples/apparmor/libvirt-lxc +Index: libvirt-3.7.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-3.6.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-3.6.0/examples/apparmor/libvirt-lxc +--- libvirt-3.7.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-3.7.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch index b945340..601f8ab 100644 --- a/blockcopy-check-dst-identical-device.patch +++ b/blockcopy-check-dst-identical-device.patch @@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-3.6.0/src/qemu/qemu_driver.c +Index: libvirt-3.7.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-3.6.0.orig/src/qemu/qemu_driver.c -+++ libvirt-3.6.0/src/qemu/qemu_driver.c -@@ -16836,6 +16836,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-3.7.0.orig/src/qemu/qemu_driver.c ++++ libvirt-3.7.0/src/qemu/qemu_driver.c +@@ -16976,6 +16976,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } diff --git a/e4cb8500-avoid-malicious-ssh-hostname-as-args.patch b/e4cb8500-avoid-malicious-ssh-hostname-as-args.patch deleted file mode 100644 index 05da22e..0000000 --- a/e4cb8500-avoid-malicious-ssh-hostname-as-args.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit e4cb8500810a310a10a6cb359e1b53fac03ed597 -Author: Daniel P. Berrange -Date: Fri Aug 11 17:19:53 2017 +0100 - - rpc: avoid ssh interpreting malicious hostname as arguments - - Inspired by the recent GIT / Mercurial security flaws - (http://blog.recurity-labs.com/2017-08-10/scm-vulns), - consider someone/something manages to feed libvirt a bogus - URI such as: - - virsh -c qemu+ssh://-oProxyCommand=gnome-calculator/system - - In this case, the hosname "-oProxyCommand=gnome-calculator" - will get interpreted as an argument to ssh, not a hostname. - Fortunately, due to the set of args we have following the - hostname, SSH will then interpret our bit of shell script - that runs 'nc' on the remote host as a cipher name, which is - clearly invalid. This makes ssh exit during argv parsing and - so it never tries to run gnome-calculator. - - We are lucky this time, but lets be more paranoid, by using - '--' to explicitly tell SSH when it has finished seeing - command line options. This forces it to interpret - "-oProxyCommand=gnome-calculator" as a hostname, and thus - see a fail from hostname lookup. - - Signed-off-by: Daniel P. Berrange - -Index: libvirt-3.6.0/src/rpc/virnetsocket.c -=================================================================== ---- libvirt-3.6.0.orig/src/rpc/virnetsocket.c -+++ libvirt-3.6.0/src/rpc/virnetsocket.c -@@ -868,7 +868,7 @@ int virNetSocketNewConnectSSH(const char - if (!netcat) - netcat = "nc"; - -- virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); -+ virCommandAddArgList(cmd, "--", nodename, "sh", "-c", NULL); - - virBufferEscapeShell(&buf, netcat); - if (virBufferCheckError(&buf) < 0) { diff --git a/f536b0dd-tests-arch-independent-hash.patch b/f536b0dd-tests-arch-independent-hash.patch deleted file mode 100644 index 2631285..0000000 --- a/f536b0dd-tests-arch-independent-hash.patch +++ /dev/null @@ -1,139 +0,0 @@ -commit f536b0dd7318c736c20ae646209671011d16c12c -Author: Peter Krempa -Date: Wed Aug 2 17:23:51 2017 +0200 - - tests: deterministichash: Make hash tables arch-independent - - It turns out that our implementation of the hashing function is - endian-dependent and thus if used on various architectures the testsuite - may have different results. Work this around by mocking virHashCodeGen - to something which does not use bit operations instead of just setting a - deterministic seed. - -Index: libvirt-3.6.0/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result -=================================================================== ---- libvirt-3.6.0.orig/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result -+++ libvirt-3.6.0/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result -@@ -1,15 +1,3 @@ --drive-ide0-0-1 --filename : '/var/lib/libvirt/images/relsnap.qcow2' --format node : '#block1290' --format drv : 'qcow2' --storage node: '#block1107' --storage drv : 'file' -- filename : '/var/lib/libvirt/images/base.qcow2' -- format node : '#block927' -- format drv : 'qcow2' -- storage node: '#block800' -- storage drv : 'file' -- - drive-ide0-0-0 - filename : '/var/lib/libvirt/images/img3' - format node : '#block118' -@@ -31,3 +19,15 @@ storage drv : 'file' - format drv : 'qcow2' - storage node: '#block614' - storage drv : 'file' -+ -+drive-ide0-0-1 -+filename : '/var/lib/libvirt/images/relsnap.qcow2' -+format node : '#block1290' -+format drv : 'qcow2' -+storage node: '#block1107' -+storage drv : 'file' -+ filename : '/var/lib/libvirt/images/base.qcow2' -+ format node : '#block927' -+ format drv : 'qcow2' -+ storage node: '#block800' -+ storage drv : 'file' -Index: libvirt-3.6.0/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result -=================================================================== ---- libvirt-3.6.0.orig/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result -+++ libvirt-3.6.0/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result -@@ -1,15 +1,3 @@ --drive-sata0-0-1 --filename : '/var/lib/libvirt/images/b.qcow2' --format node : '#block548' --format drv : 'qcow2' --storage node: '#block487' --storage drv : 'file' -- filename : '/var/lib/libvirt/images/base.qcow2' -- format node : '#block771' -- format drv : 'qcow2' -- storage node: '#block692' -- storage drv : 'file' -- - drive-sata0-0-0 - filename : '/var/lib/libvirt/images/a.qcow2' - format node : '#block132' -@@ -21,3 +9,15 @@ storage drv : 'file' - format drv : 'qcow2' - storage node: '#block224' - storage drv : 'file' -+ -+drive-sata0-0-1 -+filename : '/var/lib/libvirt/images/b.qcow2' -+format node : '#block548' -+format drv : 'qcow2' -+storage node: '#block487' -+storage drv : 'file' -+ filename : '/var/lib/libvirt/images/base.qcow2' -+ format node : '#block771' -+ format drv : 'qcow2' -+ storage node: '#block692' -+ storage drv : 'file' -Index: libvirt-3.6.0/tests/virdeterministichashmock.c -=================================================================== ---- libvirt-3.6.0.orig/tests/virdeterministichashmock.c -+++ libvirt-3.6.0/tests/virdeterministichashmock.c -@@ -20,10 +20,19 @@ - - #include - --#include "virrandom.h" -+#include "util/virhashcode.h" - --uint64_t virRandomBits(int nbits ATTRIBUTE_UNUSED) -+uint32_t -+virHashCodeGen(const void *key, -+ size_t len, -+ uint32_t seed ATTRIBUTE_UNUSED) - { -- return 4; /* chosen by fair dice roll. -- guaranteed to be random. */ -+ const uint8_t *k = key; -+ uint32_t h = 0; -+ size_t i; -+ -+ for (i = 0; i < len; i++) -+ h += k[i]; -+ -+ return h; - } -Index: libvirt-3.6.0/tests/virmacmaptestdata/simple2.json -=================================================================== ---- libvirt-3.6.0.orig/tests/virmacmaptestdata/simple2.json -+++ libvirt-3.6.0/tests/virmacmaptestdata/simple2.json -@@ -1,16 +1,16 @@ - [ - { -- "domain": "f25", -+ "domain": "f24", - "macs": [ -- "00:11:22:33:44:55", -- "aa:bb:cc:00:11:22" -+ "aa:bb:cc:dd:ee:ff", -+ "a1:b2:c3:d4:e5:f6" - ] - }, - { -- "domain": "f24", -+ "domain": "f25", - "macs": [ -- "aa:bb:cc:dd:ee:ff", -- "a1:b2:c3:d4:e5:f6" -+ "00:11:22:33:44:55", -+ "aa:bb:cc:00:11:22" - ] - } - ] diff --git a/libvirt-3.6.0.tar.xz b/libvirt-3.6.0.tar.xz deleted file mode 100644 index d63182f..0000000 --- a/libvirt-3.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a2c97f6950796f300f6a2e0404f4de8e51c3b9430cdb82738439adb0ac59e3d -size 14797704 diff --git a/libvirt-3.6.0.tar.xz.asc b/libvirt-3.6.0.tar.xz.asc deleted file mode 100644 index 7749fa9..0000000 --- a/libvirt-3.6.0.tar.xz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABAgAGBQJZgTFuAAoJEBVYiyZZa+pdtVgH/AlO4NEMgA8VLeOCrQxDCAqB -Bvfx3tw1pm+6suwSAQBUfNIjRcmZzJbXXfmZX20K4pIjUBR3edz30ergxtIM9YXP -DJ+oPTl7lE1ibaqE/6lFD16KXZ1pXK4iAvbSske84ANYHjADUVOZDeov5beqs3Ef -DPCpN03Y5RPe/lrfY1c3ma3+wq5jFBJp4ERgpsKIuviD2XUFAhyiXyogQDqzyIZ1 -I54GDZfJWFAof1iTB9f0mqtEEhNPCnBY/veS5GjUHI4EUrs+/TbYINLqfTyttf5l -Qyw9QOXvhQzGu0YF2TLvlVLcSfz/ZqeQkACROz4bRi85UvlmcSIVek01Qnr82Hw= -=ZqVA ------END PGP SIGNATURE----- diff --git a/libvirt-3.7.0.tar.xz b/libvirt-3.7.0.tar.xz new file mode 100644 index 0000000..e85c435 --- /dev/null +++ b/libvirt-3.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e7bcb209eeef99f026484293abc733e30ed06dabcdde62c4c3e95f71b2b67ba +size 14803752 diff --git a/libvirt-3.7.0.tar.xz.asc b/libvirt-3.7.0.tar.xz.asc new file mode 100644 index 0000000..92491ef --- /dev/null +++ b/libvirt-3.7.0.tar.xz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABAgAGBQJZrSOIAAoJEBVYiyZZa+pd/9IH/1bGgu6+j2Q86NNQQ/rEsmL6 +1lR2hvZCNxKEVSNshJfWQvSY2UT87HKYJPMbVdRJx6j/vc48bG8lZvt128wRMjji +sjJ/eDP0oLi48ZnICYx+KNcmLJVYjadueCqYclUIUrHhUsNzGZin3bmLN7vPLEP/ +BeRmexJqfTSKftxHY1/ZMEJmTkHP7xBRJ56C2wascBjqtbw6UT0L97bn+rtm659Q +278zDS8vwalwef5CnTm89Pp7d2oBHtD52XE+jJtpv1mC1zwvKCpPhfgVj1U3+mPR +js3D0avcBQ9lApvAl6ByAJvXDaGb3T9MpM4K0UYr5j5p3h3/ffL3i/0+4ez46cc= +=DNDB +-----END PGP SIGNATURE----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index fb720ba..9f25a7a 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML From: -Index: libvirt-3.6.0/src/cpu/cpu_map.xml +Index: libvirt-3.7.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-3.6.0.orig/src/cpu/cpu_map.xml -+++ libvirt-3.6.0/src/cpu/cpu_map.xml +--- libvirt-3.7.0.orig/src/cpu/cpu_map.xml ++++ libvirt-3.7.0/src/cpu/cpu_map.xml @@ -1569,6 +1569,8 @@ diff --git a/libvirt-supportconfig b/libvirt-supportconfig index 3212c70..e408d88 100644 --- a/libvirt-supportconfig +++ b/libvirt-supportconfig @@ -98,7 +98,7 @@ if systemctl is-enabled libvirtd.service 2>&1 > /dev/null; then plugin_command "virsh snapshot-list $DOM" echo done - # dump configuration info of inactive domains od default URI + # dump configuration info of inactive domains on default URI for DOM in $(virsh list --name --inactive) do plugin_command "virsh dumpxml $DOM" @@ -113,6 +113,11 @@ if systemctl is-enabled libvirtd.service 2>&1 > /dev/null; then echo done fi + + # dump active networks, interfaces and storage pools + plugin_command "virsh net-list" + plugin_command "virsh iface-list" + plugin_command "virsh pool-list" fi # dump libvirtd-related conf files diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 6d513c7..50c60a4 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-3.6.0/configure.ac +Index: libvirt-3.7.0/configure.ac =================================================================== ---- libvirt-3.6.0.orig/configure.ac -+++ libvirt-3.6.0/configure.ac +--- libvirt-3.7.0.orig/configure.ac ++++ libvirt-3.7.0/configure.ac @@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -26,11 +26,11 @@ Index: libvirt-3.6.0/configure.ac LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN -Index: libvirt-3.6.0/src/Makefile.am +Index: libvirt-3.7.0/src/Makefile.am =================================================================== ---- libvirt-3.6.0.orig/src/Makefile.am -+++ libvirt-3.6.0/src/Makefile.am -@@ -1036,6 +1036,10 @@ if WITH_NETCF +--- libvirt-3.7.0.orig/src/Makefile.am ++++ libvirt-3.7.0/src/Makefile.am +@@ -1037,6 +1037,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -41,7 +41,7 @@ Index: libvirt-3.6.0/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1648,6 +1652,10 @@ if WITH_NETCF +@@ -1649,6 +1653,10 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) endif WITH_NETCF @@ -52,11 +52,11 @@ Index: libvirt-3.6.0/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-3.6.0/tools/virsh.c +Index: libvirt-3.7.0/tools/virsh.c =================================================================== ---- libvirt-3.6.0.orig/tools/virsh.c -+++ libvirt-3.6.0/tools/virsh.c -@@ -570,6 +570,8 @@ virshShowVersion(vshControl *ctl ATTRIBU +--- libvirt-3.7.0.orig/tools/virsh.c ++++ libvirt-3.7.0/tools/virsh.c +@@ -576,6 +576,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -65,10 +65,10 @@ Index: libvirt-3.6.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-3.6.0/src/interface/interface_backend_netcf.c +Index: libvirt-3.7.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-3.6.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-3.6.0/src/interface/interface_backend_netcf.c +--- libvirt-3.7.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-3.7.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -152,10 +152,10 @@ Index: libvirt-3.6.0/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-3.6.0/src/interface/interface_driver.c +Index: libvirt-3.7.0/src/interface/interface_driver.c =================================================================== ---- libvirt-3.6.0.orig/src/interface/interface_driver.c -+++ libvirt-3.6.0/src/interface/interface_driver.c +--- libvirt-3.7.0.orig/src/interface/interface_driver.c ++++ libvirt-3.7.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -173,10 +173,10 @@ Index: libvirt-3.6.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-3.6.0/m4/virt-netcontrol.m4 +Index: libvirt-3.7.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-3.6.0/m4/virt-netcontrol.m4 ++++ libvirt-3.7.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index b59b56b..eacde35 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Sep 15 16:20:34 UTC 2017 - jfehlig@suse.com + +- Update to libvirt 3.7.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: + 8982f3ab-util-hash-header.patch, + 0b1ecf7b-virHashCodeGen-mockable.patch, + f536b0dd-tests-arch-independent-hash.patch, + e4cb8500-avoid-malicious-ssh-hostname-as-args.patch + +------------------------------------------------------------------- +Fri Sep 1 19:55:30 UTC 2017 - jfehlig@suse.com + +- Support OVMF 4MB firmware images + Adjustment to spec file and suse-ovmf-paths.patch + +------------------------------------------------------------------- +Thu Aug 31 19:33:01 UTC 2017 - jfehlig@suse.com + +- supportconfig plugin: list active networks, interfaces and + storage pools + ------------------------------------------------------------------- Tue Aug 29 22:34:42 UTC 2017 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 74db38b..4af7890 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -165,7 +165,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 3.6.0 +Version: 3.7.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -230,7 +230,6 @@ BuildRequires: perl BuildRequires: python BuildRequires: python-xml BuildRequires: readline-devel -BuildRequires: xhtml-dtd # perl XPath is needed since we have a patch touching files that cause # hvsupport.html to be regenerated BuildRequires: perl(XML::XPath) @@ -305,10 +304,6 @@ Source4: libvirt-supportconfig Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 8982f3ab-util-hash-header.patch -Patch1: 0b1ecf7b-virHashCodeGen-mockable.patch -Patch2: f536b0dd-tests-arch-independent-hash.patch -Patch3: e4cb8500-avoid-malicious-ssh-hostname-as-args.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -874,10 +869,6 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -1015,7 +1006,14 @@ libvirt plugin for NSS for translating domain names into IP addresses. # x86_64 UEFI firmwares # To more closely resemble actual hardware, we use the firmwares with # embedded Microsoft keys -LOADERS="/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" +# +# The Windows HCK test requires a bigger variable store, so 4MB firmware +# images have been introduced. They are advertised first and will be +# used by default for new VM installations. The 2MB images are still +# available for existing VMs, and can be selected for new installations +# as well. +LOADERS="/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin" +LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" # aarch64 UEFI firmwares LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin" %define arg_loader_nvram --with-loader-nvram="$LOADERS" diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index 4f696b9..e146fef 100644 --- a/libxl-dom-reset.patch +++ b/libxl-dom-reset.patch @@ -8,10 +8,10 @@ Date: Mon Jun 23 15:51:20 2014 -0600 option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-3.6.0/src/libxl/libxl_driver.c +Index: libvirt-3.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.6.0/src/libxl/libxl_driver.c +--- libvirt-3.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-3.7.0/src/libxl/libxl_driver.c @@ -1381,6 +1381,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } diff --git a/libxl-qemu-emulator-caps.patch b/libxl-qemu-emulator-caps.patch index 1286f85..c5d36b2 100644 --- a/libxl-qemu-emulator-caps.patch +++ b/libxl-qemu-emulator-caps.patch @@ -8,10 +8,10 @@ as the default , instead of the qemu-xen one. See FATE#320638 for details. -Index: libvirt-3.6.0/src/libxl/libxl_capabilities.c +Index: libvirt-3.7.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-3.6.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-3.6.0/src/libxl/libxl_capabilities.c +--- libvirt-3.7.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-3.7.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index ff7e122..649944c 100644 --- a/libxl-set-cach-mode.patch +++ b/libxl-set-cach-mode.patch @@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425 src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-3.6.0/src/libxl/libxl_conf.c +Index: libvirt-3.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.6.0/src/libxl/libxl_conf.c +--- libvirt-3.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-3.7.0/src/libxl/libxl_conf.c @@ -646,6 +646,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index 0cb57be..2a036f8 100644 --- a/libxl-set-migration-constraints.patch +++ b/libxl-set-migration-constraints.patch @@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-3.6.0/include/libvirt/libvirt-domain.h +Index: libvirt-3.7.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-3.6.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-3.6.0/include/libvirt/libvirt-domain.h +--- libvirt-3.7.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-3.7.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 @@ Index: libvirt-3.6.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-3.6.0/src/libxl/libxl_driver.c +Index: libvirt-3.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.6.0/src/libxl/libxl_driver.c +--- libvirt-3.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-3.7.0/src/libxl/libxl_driver.c @@ -6105,6 +6105,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ Index: libvirt-3.6.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-3.6.0/src/libxl/libxl_migration.c +Index: libvirt-3.7.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-3.6.0.orig/src/libxl/libxl_migration.c -+++ libvirt-3.6.0/src/libxl/libxl_migration.c +--- libvirt-3.7.0.orig/src/libxl/libxl_migration.c ++++ libvirt-3.7.0/src/libxl/libxl_migration.c @@ -359,18 +359,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, @@ -263,10 +263,10 @@ Index: libvirt-3.6.0/src/libxl/libxl_migration.c virObjectLock(vm); cleanup: -Index: libvirt-3.6.0/src/libxl/libxl_migration.h +Index: libvirt-3.7.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-3.6.0.orig/src/libxl/libxl_migration.h -+++ libvirt-3.6.0/src/libxl/libxl_migration.h +--- libvirt-3.7.0.orig/src/libxl/libxl_migration.h ++++ libvirt-3.7.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 @@ Index: libvirt-3.6.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, -Index: libvirt-3.6.0/tools/virsh-domain.c +Index: libvirt-3.7.0/tools/virsh-domain.c =================================================================== ---- libvirt-3.6.0.orig/tools/virsh-domain.c -+++ libvirt-3.6.0/tools/virsh-domain.c -@@ -10246,6 +10246,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-3.7.0.orig/tools/virsh-domain.c ++++ libvirt-3.7.0/tools/virsh-domain.c +@@ -10432,6 +10432,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_BOOL, .help = N_("use TLS for migration") }, @@ -338,7 +338,7 @@ Index: libvirt-3.6.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10269,6 +10285,7 @@ doMigrate(void *opaque) +@@ -10455,6 +10471,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -346,7 +346,7 @@ Index: libvirt-3.6.0/tools/virsh-domain.c sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10388,6 +10405,27 @@ doMigrate(void *opaque) +@@ -10574,6 +10591,27 @@ doMigrate(void *opaque) goto save_error; } @@ -374,11 +374,11 @@ Index: libvirt-3.6.0/tools/virsh-domain.c if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-3.6.0/tools/virsh.pod +Index: libvirt-3.7.0/tools/virsh.pod =================================================================== ---- libvirt-3.6.0.orig/tools/virsh.pod -+++ libvirt-3.6.0/tools/virsh.pod -@@ -1771,6 +1771,14 @@ Providing I<--tls> causes the migration +--- libvirt-3.7.0.orig/tools/virsh.pod ++++ libvirt-3.7.0/tools/virsh.pod +@@ -1810,6 +1810,14 @@ Providing I<--tls> causes the migration the migration of the domain. Usage requires proper TLS setup for both source and target. diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index 343ec56..58d7501 100644 --- a/libxl-support-block-script.patch +++ b/libxl-support-block-script.patch @@ -7,10 +7,10 @@ and npiv. For more details, see bsc#954872 and FATE#319810 -Index: libvirt-3.6.0/src/libxl/libxl_conf.c +Index: libvirt-3.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.6.0/src/libxl/libxl_conf.c +--- libvirt-3.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-3.7.0/src/libxl/libxl_conf.c @@ -646,6 +646,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index ec79911..c672e9c 100644 --- a/lxc-wait-after-eth-del.patch +++ b/lxc-wait-after-eth-del.patch @@ -13,10 +13,10 @@ device with the same name that is being created. src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-3.6.0/src/lxc/lxc_controller.c +Index: libvirt-3.7.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-3.6.0.orig/src/lxc/lxc_controller.c -+++ libvirt-3.6.0/src/lxc/lxc_controller.c +--- libvirt-3.7.0.orig/src/lxc/lxc_controller.c ++++ libvirt-3.7.0/src/lxc/lxc_controller.c @@ -73,6 +73,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -33,10 +33,10 @@ Index: libvirt-3.6.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-3.6.0/src/lxc/lxc_driver.c +Index: libvirt-3.7.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-3.6.0.orig/src/lxc/lxc_driver.c -+++ libvirt-3.6.0/src/lxc/lxc_driver.c +--- libvirt-3.7.0.orig/src/lxc/lxc_driver.c ++++ libvirt-3.7.0/src/lxc/lxc_driver.c @@ -76,6 +76,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -61,10 +61,10 @@ Index: libvirt-3.6.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-3.6.0/src/lxc/lxc_process.c +Index: libvirt-3.7.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-3.6.0.orig/src/lxc/lxc_process.c -+++ libvirt-3.6.0/src/lxc/lxc_process.c +--- libvirt-3.7.0.orig/src/lxc/lxc_process.c ++++ libvirt-3.7.0/src/lxc/lxc_process.c @@ -52,6 +52,7 @@ #include "viratomic.h" #include "virprocess.h" diff --git a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch index 324a9e1..52ba107 100644 --- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch +++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -17,11 +17,11 @@ Signed-off-by: Martin Wilck tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-3.6.0/src/network/bridge_driver.c +Index: libvirt-3.7.0/src/network/bridge_driver.c =================================================================== ---- libvirt-3.6.0.orig/src/network/bridge_driver.c -+++ libvirt-3.6.0/src/network/bridge_driver.c -@@ -1454,7 +1454,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-3.7.0.orig/src/network/bridge_driver.c ++++ libvirt-3.7.0/src/network/bridge_driver.c +@@ -1393,7 +1393,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 @@ Index: libvirt-3.6.0/src/network/bridge_driver.c } if (ipdef->tftproot) { -Index: libvirt-3.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-3.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-3.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-3.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-3.7.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-3.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index e729b44..841c985 100644 --- a/ppc64le-canonical-name.patch +++ b/ppc64le-canonical-name.patch @@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64 See bnc#894956 -Index: libvirt-3.6.0/src/util/virarch.c +Index: libvirt-3.7.0/src/util/virarch.c =================================================================== ---- libvirt-3.6.0.orig/src/util/virarch.c -+++ libvirt-3.6.0/src/util/virarch.c +--- libvirt-3.7.0.orig/src/util/virarch.c ++++ libvirt-3.7.0/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { diff --git a/qemu-apparmor-screenshot.patch b/qemu-apparmor-screenshot.patch index eb3eb72..20a9b1b 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,11 +1,11 @@ -Index: libvirt-3.6.0/examples/apparmor/libvirt-qemu +Index: libvirt-3.7.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.6.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.6.0/examples/apparmor/libvirt-qemu -@@ -172,3 +172,6 @@ - @{PROC}/device-tree/ r, - @{PROC}/device-tree/** r, - /sys/firmware/devicetree/** r, +--- libvirt-3.7.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-3.7.0/examples/apparmor/libvirt-qemu +@@ -178,3 +178,6 @@ + /sys/devices/system/node/ r, + /sys/devices/system/node/node[0-9]*/meminfo r, + /sys/module/vhost/parameters/max_mem_regions r, + + # Temporary screendump rule -- See bsc#904426 + /var/cache/libvirt/qemu/qemu.screendump.* rw, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 231af58..104e6a3 100644 --- a/support-managed-pci-xen-driver.patch +++ b/support-managed-pci-xen-driver.patch @@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-3.6.0/src/xenconfig/xen_common.c +Index: libvirt-3.7.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-3.6.0.orig/src/xenconfig/xen_common.c -+++ libvirt-3.6.0/src/xenconfig/xen_common.c +--- libvirt-3.7.0.orig/src/xenconfig/xen_common.c ++++ libvirt-3.7.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-3.6.0/src/xenconfig/xen_common.c hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-3.6.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.7.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.6.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.6.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.7.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.7.0/src/xenconfig/xen_sxpr.c @@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch index 3e723ee..577cf26 100644 --- a/suse-libvirt-guests-service.patch +++ b/suse-libvirt-guests-service.patch @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-3.6.0/tools/libvirt-guests.init.in +Index: libvirt-3.7.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-3.6.0.orig/tools/libvirt-guests.init.in -+++ libvirt-3.6.0/tools/libvirt-guests.init.in +--- libvirt-3.7.0.orig/tools/libvirt-guests.init.in ++++ libvirt-3.7.0/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -45,10 +45,10 @@ Index: libvirt-3.6.0/tools/libvirt-guests.init.in # exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-3.6.0/tools/libvirt-guests.sh.in +Index: libvirt-3.7.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-3.6.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-3.6.0/tools/libvirt-guests.sh.in +--- libvirt-3.7.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-3.7.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -208,10 +208,10 @@ Index: libvirt-3.6.0/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-3.6.0/tools/libvirt-guests.sysconf +Index: libvirt-3.7.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-3.6.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-3.6.0/tools/libvirt-guests.sysconf +--- libvirt-3.7.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-3.7.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + @@ -245,7 +245,7 @@ Index: libvirt-3.6.0/tools/libvirt-guests.sysconf # action taken on host shutdown # - suspend all running guests are suspended using virsh managedsave # - shutdown all running guests are asked to shutdown. Please be careful with -@@ -22,12 +32,16 @@ +@@ -22,14 +32,18 @@ # which just needs a long time to shutdown. When setting # ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a # value suitable for your guests. @@ -254,8 +254,10 @@ Index: libvirt-3.6.0/tools/libvirt-guests.sysconf +## Type: integer +## Default: 0 - # If set to non-zero, shutdown will suspend guests concurrently. Number of - # guests on shutdown at any time will not exceed number set in this variable. + # Number of guests will be shutdown concurrently, taking effect when + # "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown one + # after another. Number of guests on shutdown at any time will not exceed number + # set in this variable. -#PARALLEL_SHUTDOWN=0 +PARALLEL_SHUTDOWN=0 @@ -264,7 +266,7 @@ Index: libvirt-3.6.0/tools/libvirt-guests.sysconf # Number of seconds we're willing to wait for a guest to shut down. If parallel # shutdown is enabled, this timeout applies as a timeout for shutting down all # guests on a single URI defined in the variable URIS. If this is 0, then there -@@ -35,14 +49,18 @@ +@@ -37,14 +51,18 @@ # request). The default value is 300 seconds (5 minutes). #SHUTDOWN_TIMEOUT=300 diff --git a/suse-libvirtd-disable-tls.patch b/suse-libvirtd-disable-tls.patch index aca2c55..39f8f3f 100644 --- a/suse-libvirtd-disable-tls.patch +++ b/suse-libvirtd-disable-tls.patch @@ -3,10 +3,10 @@ Disable TLS by default 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-3.6.0/daemon/libvirtd.conf +Index: libvirt-3.7.0/daemon/libvirtd.conf =================================================================== ---- libvirt-3.6.0.orig/daemon/libvirtd.conf -+++ libvirt-3.6.0/daemon/libvirtd.conf +--- libvirt-3.7.0.orig/daemon/libvirtd.conf ++++ libvirt-3.7.0/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -18,10 +18,10 @@ Index: libvirt-3.6.0/daemon/libvirtd.conf # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-3.6.0/daemon/libvirtd-config.c +Index: libvirt-3.7.0/daemon/libvirtd-config.c =================================================================== ---- libvirt-3.6.0.orig/daemon/libvirtd-config.c -+++ libvirt-3.6.0/daemon/libvirtd-config.c +--- libvirt-3.7.0.orig/daemon/libvirtd-config.c ++++ libvirt-3.7.0/daemon/libvirtd-config.c @@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -31,10 +31,10 @@ Index: libvirt-3.6.0/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-3.6.0/daemon/test_libvirtd.aug.in +Index: libvirt-3.7.0/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-3.6.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-3.6.0/daemon/test_libvirtd.aug.in +--- libvirt-3.7.0.orig/daemon/test_libvirtd.aug.in ++++ libvirt-3.7.0/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: diff --git a/suse-libvirtd-service-xen.patch b/suse-libvirtd-service-xen.patch index a91913d..fd5dd1c 100644 --- a/suse-libvirtd-service-xen.patch +++ b/suse-libvirtd-service-xen.patch @@ -7,10 +7,10 @@ On SUSE distros, we promote libvirt and all the libvirt-based tools. If a user installs libvirt on their SUSE Xen host, then libvirt should be king and override xendomains. See bsc#1015348 -Index: libvirt-3.6.0/daemon/libvirtd.service.in +Index: libvirt-3.7.0/daemon/libvirtd.service.in =================================================================== ---- libvirt-3.6.0.orig/daemon/libvirtd.service.in -+++ libvirt-3.6.0/daemon/libvirtd.service.in +--- libvirt-3.7.0.orig/daemon/libvirtd.service.in ++++ libvirt-3.7.0/daemon/libvirtd.service.in @@ -14,6 +14,8 @@ After=iscsid.service After=apparmor.service After=local-fs.target diff --git a/suse-libvirtd-sysconfig-settings.patch b/suse-libvirtd-sysconfig-settings.patch index 64c1397..9a5fd80 100644 --- a/suse-libvirtd-sysconfig-settings.patch +++ b/suse-libvirtd-sysconfig-settings.patch @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-3.6.0/daemon/libvirtd.sysconf +Index: libvirt-3.7.0/daemon/libvirtd.sysconf =================================================================== ---- libvirt-3.6.0.orig/daemon/libvirtd.sysconf -+++ libvirt-3.6.0/daemon/libvirtd.sysconf +--- libvirt-3.7.0.orig/daemon/libvirtd.sysconf ++++ libvirt-3.7.0/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/suse-ovmf-paths.patch b/suse-ovmf-paths.patch index df63a7b..c8dec43 100644 --- a/suse-ovmf-paths.patch +++ b/suse-ovmf-paths.patch @@ -1,10 +1,10 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-3.6.0/src/qemu/qemu.conf +Index: libvirt-3.7.0/src/qemu/qemu.conf =================================================================== ---- libvirt-3.6.0.orig/src/qemu/qemu.conf -+++ libvirt-3.6.0/src/qemu/qemu.conf -@@ -695,10 +695,8 @@ security_default_confined = 0 +--- libvirt-3.7.0.orig/src/qemu/qemu.conf ++++ libvirt-3.7.0/src/qemu/qemu.conf +@@ -703,10 +703,9 @@ security_default_confined = 0 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. #nvram = [ @@ -12,16 +12,17 @@ Index: libvirt-3.6.0/src/qemu/qemu.conf -# "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd", -# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd", -# "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd" ++# "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin", +# "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin", +# "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin" #] # The backend to use for handling stdout/stderr output from -Index: libvirt-3.6.0/src/qemu/qemu_conf.c +Index: libvirt-3.7.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-3.6.0.orig/src/qemu/qemu_conf.c -+++ libvirt-3.6.0/src/qemu/qemu_conf.c -@@ -127,10 +127,8 @@ void qemuDomainCmdlineDefFree(qemuDomain +--- libvirt-3.7.0.orig/src/qemu/qemu_conf.c ++++ libvirt-3.7.0/src/qemu/qemu_conf.c +@@ -127,10 +127,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM # define DEFAULT_LOADER_NVRAM \ @@ -29,6 +30,7 @@ Index: libvirt-3.6.0/src/qemu/qemu_conf.c - "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd:" \ - "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd:" \ - "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd" ++ "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin:" \ + "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin:" \ + "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin" #endif diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 6260481..be502ba 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -7,11 +7,11 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch, etc.), but for now they are all lumped together in this single patch. -Index: libvirt-3.6.0/src/qemu/qemu.conf +Index: libvirt-3.7.0/src/qemu/qemu.conf =================================================================== ---- libvirt-3.6.0.orig/src/qemu/qemu.conf -+++ libvirt-3.6.0/src/qemu/qemu.conf -@@ -332,11 +332,20 @@ +--- libvirt-3.7.0.orig/src/qemu/qemu.conf ++++ libvirt-3.7.0/src/qemu/qemu.conf +@@ -340,11 +340,20 @@ # isolation, but it cannot appear in a list of drivers. # #security_driver = "selinux" @@ -34,7 +34,7 @@ Index: libvirt-3.6.0/src/qemu/qemu.conf # If set to non-zero, then attempts to create unconfined # guests will be blocked. Defaults to 0. -@@ -580,11 +589,22 @@ +@@ -588,11 +597,22 @@ #allow_disk_format_probing = 1 diff --git a/suse-virtlockd-sysconfig-settings.patch b/suse-virtlockd-sysconfig-settings.patch index 4146d3a..4dc3730 100644 --- a/suse-virtlockd-sysconfig-settings.patch +++ b/suse-virtlockd-sysconfig-settings.patch @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-3.6.0/src/locking/virtlockd.sysconf +Index: libvirt-3.7.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-3.6.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-3.6.0/src/locking/virtlockd.sysconf +--- libvirt-3.7.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-3.7.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + diff --git a/suse-virtlogd-sysconfig-settings.patch b/suse-virtlogd-sysconfig-settings.patch index be635f1..8ee6e8e 100644 --- a/suse-virtlogd-sysconfig-settings.patch +++ b/suse-virtlogd-sysconfig-settings.patch @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-3.6.0/src/logging/virtlogd.sysconf +Index: libvirt-3.7.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-3.6.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-3.6.0/src/logging/virtlogd.sysconf +--- libvirt-3.7.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-3.7.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index f91f1ce..f95e974 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-3.6.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.7.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.6.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.6.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.7.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.7.0/src/xenconfig/xen_sxpr.c @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, diff --git a/xen-sxpr-disk-type.patch b/xen-sxpr-disk-type.patch index a4182d7..9cc803a 100644 --- a/xen-sxpr-disk-type.patch +++ b/xen-sxpr-disk-type.patch @@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c. https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-3.6.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.7.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.6.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.6.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.7.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.7.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 */