diff --git a/0001-Extract-stats-functions-from-the-qemu-driver.patch b/0001-Extract-stats-functions-from-the-qemu-driver.patch index 438c20a..9ef8b2f 100644 --- a/0001-Extract-stats-functions-from-the-qemu-driver.patch +++ b/0001-Extract-stats-functions-from-the-qemu-driver.patch @@ -18,10 +18,10 @@ them. create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-7.6.0/src/conf/domain_stats.c +Index: libvirt-7.7.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-7.6.0/src/conf/domain_stats.c ++++ libvirt-7.7.0/src/conf/domain_stats.c @@ -0,0 +1,117 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -140,10 +140,10 @@ Index: libvirt-7.6.0/src/conf/domain_stats.c +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-7.6.0/src/conf/domain_stats.h +Index: libvirt-7.7.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-7.6.0/src/conf/domain_stats.h ++++ libvirt-7.7.0/src/conf/domain_stats.h @@ -0,0 +1,60 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -205,11 +205,11 @@ Index: libvirt-7.6.0/src/conf/domain_stats.h + virTypedParamList *params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-7.6.0/src/libvirt_private.syms +Index: libvirt-7.7.0/src/libvirt_private.syms =================================================================== ---- libvirt-7.6.0.orig/src/libvirt_private.syms -+++ libvirt-7.6.0/src/libvirt_private.syms -@@ -761,12 +761,16 @@ virDomainConfNWFilterTeardown; +--- libvirt-7.7.0.orig/src/libvirt_private.syms ++++ libvirt-7.7.0/src/libvirt_private.syms +@@ -763,12 +763,16 @@ virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -227,7 +227,7 @@ Index: libvirt-7.6.0/src/libvirt_private.syms # conf/interface_conf.h virInterfaceDefFormat; virInterfaceDefFree; -@@ -1926,6 +1930,7 @@ virCgroupGetMemoryUsage; +@@ -1933,6 +1937,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -235,11 +235,11 @@ Index: libvirt-7.6.0/src/libvirt_private.syms virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-7.6.0/src/qemu/qemu_driver.c +Index: libvirt-7.7.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/qemu/qemu_driver.c -+++ libvirt-7.6.0/src/qemu/qemu_driver.c -@@ -67,6 +67,7 @@ +--- libvirt-7.7.0.orig/src/qemu/qemu_driver.c ++++ libvirt-7.7.0/src/qemu/qemu_driver.c +@@ -68,6 +68,7 @@ #include "virarptable.h" #include "viruuid.h" #include "domain_conf.h" @@ -247,7 +247,7 @@ Index: libvirt-7.6.0/src/qemu/qemu_driver.c #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -17537,13 +17538,7 @@ qemuDomainGetStatsState(virQEMUDriver *d +@@ -17448,13 +17449,7 @@ qemuDomainGetStatsState(virQEMUDriver *d virTypedParamList *params, unsigned int privflags G_GNUC_UNUSED) { @@ -262,7 +262,7 @@ Index: libvirt-7.6.0/src/qemu/qemu_driver.c } -@@ -17836,25 +17831,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -17746,25 +17741,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj virTypedParamList *params) { qemuDomainObjPrivate *priv = dom->privateData; @@ -289,7 +289,7 @@ Index: libvirt-7.6.0/src/qemu/qemu_driver.c } static int -@@ -18047,76 +18028,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr +@@ -17957,76 +17938,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr return ret; } @@ -367,12 +367,12 @@ Index: libvirt-7.6.0/src/qemu/qemu_driver.c /* refresh information by opening images on the disk */ static int -Index: libvirt-7.6.0/src/util/vircgroup.c +Index: libvirt-7.7.0/src/util/vircgroup.c =================================================================== ---- libvirt-7.6.0.orig/src/util/vircgroup.c -+++ libvirt-7.6.0/src/util/vircgroup.c -@@ -3005,6 +3005,31 @@ virCgroupControllerAvailable(int control - return virCgroupHasController(cgroup, controller); +--- libvirt-7.7.0.orig/src/util/vircgroup.c ++++ libvirt-7.7.0/src/util/vircgroup.c +@@ -3036,6 +3036,31 @@ virCgroupGetInode(virCgroup *cgroup) + return st.st_ino; } +int @@ -403,7 +403,7 @@ Index: libvirt-7.6.0/src/util/vircgroup.c #else /* !__linux__ */ bool -@@ -3014,6 +3039,14 @@ virCgroupAvailable(void) +@@ -3045,6 +3070,14 @@ virCgroupAvailable(void) } @@ -418,10 +418,10 @@ Index: libvirt-7.6.0/src/util/vircgroup.c int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-7.6.0/src/util/vircgroup.h +Index: libvirt-7.7.0/src/util/vircgroup.h =================================================================== ---- libvirt-7.6.0.orig/src/util/vircgroup.h -+++ libvirt-7.6.0/src/util/vircgroup.h +--- libvirt-7.7.0.orig/src/util/vircgroup.h ++++ libvirt-7.7.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -430,17 +430,18 @@ Index: libvirt-7.6.0/src/util/vircgroup.h struct _virCgroup; typedef struct _virCgroup virCgroup; -@@ -283,3 +284,6 @@ int virCgroupSetOwner(virCgroup *cgroup, - int virCgroupHasEmptyTasks(virCgroup *cgroup, int controller); +@@ -284,4 +285,7 @@ int virCgroupHasEmptyTasks(virCgroup *cg bool virCgroupControllerAvailable(int controller); -+ + +int virCgroupGetStatsCpu(virCgroup *cgroup, + virTypedParamList *params); -Index: libvirt-7.6.0/src/conf/meson.build ++ + int virCgroupGetInode(virCgroup *cgroup); +Index: libvirt-7.7.0/src/conf/meson.build =================================================================== ---- libvirt-7.6.0.orig/src/conf/meson.build -+++ libvirt-7.6.0/src/conf/meson.build +--- libvirt-7.7.0.orig/src/conf/meson.build ++++ libvirt-7.7.0/src/conf/meson.build @@ -15,6 +15,7 @@ domain_conf_sources = [ 'domain_conf.c', 'domain_nwfilter.c', diff --git a/0001-libxl-add-support-for-BlockResize-API.patch b/0001-libxl-add-support-for-BlockResize-API.patch index c37d2f5..ec98992 100644 --- a/0001-libxl-add-support-for-BlockResize-API.patch +++ b/0001-libxl-add-support-for-BlockResize-API.patch @@ -19,10 +19,10 @@ reworking this patch and submitting it to upstream libvirt. src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-7.6.0/src/libxl/libxl_driver.c +Index: libvirt-7.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.6.0/src/libxl/libxl_driver.c +--- libvirt-7.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.7.0/src/libxl/libxl_driver.c @@ -5269,6 +5269,95 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -127,10 +127,10 @@ Index: libvirt-7.6.0/src/libxl/libxl_driver.c .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */ .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */ .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */ -Index: libvirt-7.6.0/src/libxl/libxl_api_wrapper.h +Index: libvirt-7.7.0/src/libxl/libxl_api_wrapper.h =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_api_wrapper.h -+++ libvirt-7.6.0/src/libxl/libxl_api_wrapper.h +--- libvirt-7.7.0.orig/src/libxl/libxl_api_wrapper.h ++++ libvirt-7.7.0/src/libxl/libxl_api_wrapper.h @@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c return ret; diff --git a/0002-lxc-implement-connectGetAllDomainStats.patch b/0002-lxc-implement-connectGetAllDomainStats.patch index 696fb8a..950f9f4 100644 --- a/0002-lxc-implement-connectGetAllDomainStats.patch +++ b/0002-lxc-implement-connectGetAllDomainStats.patch @@ -9,10 +9,10 @@ them using the existing API. src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-7.6.0/src/lxc/lxc_driver.c +Index: libvirt-7.7.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.6.0/src/lxc/lxc_driver.c +--- libvirt-7.7.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.7.0/src/lxc/lxc_driver.c @@ -74,6 +74,8 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" @@ -22,7 +22,7 @@ Index: libvirt-7.6.0/src/lxc/lxc_driver.c #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5064,6 +5066,128 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5083,6 +5085,128 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -151,7 +151,7 @@ Index: libvirt-7.6.0/src/lxc/lxc_driver.c /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5161,6 +5285,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5180,6 +5304,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ diff --git a/_service b/_service new file mode 100644 index 0000000..008e519 --- /dev/null +++ b/_service @@ -0,0 +1,7 @@ + + + + disable + disable + + \ No newline at end of file diff --git a/_services b/_services deleted file mode 100644 index 67b4406..0000000 --- a/_services +++ /dev/null @@ -1,7 +0,0 @@ - - - disable - disable - - \ No newline at end of file diff --git a/libvirt-7.6.0.tar.xz b/libvirt-7.6.0.tar.xz deleted file mode 100644 index 6ac0bf8..0000000 --- a/libvirt-7.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141 -size 8661024 diff --git a/libvirt-7.6.0.tar.xz.asc b/libvirt-7.6.0.tar.xz.asc deleted file mode 100644 index c761d61..0000000 --- a/libvirt-7.6.0.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmEHyNsACgkQymi+gBAI -TJzzwg//ea6U676ruG6uODGoF2B1RXbexSqqPGv0OpmhS151qL9bG/snAjpnKaAX -vJEf6rRCzIQzB1eJSt99NvUH7P0tQDvVClo/CMmr7tJWzvcMN8SgD7zlppNaHq1L -iV/dWXS+p6n4rHfZwl3PsSLH3RjCVndkUqS7QqZckxsPbn7DcELp9YtvMEecsif2 -nNmbCg6t2q5s6oTFuUafxEvBeGfciovcbv4AOb3eC9eCrLcIniWvaiKuAfsNcoLv -QVrColEFcOLl6OpdO2EI/Td2oS5rpk0thqztAbr1HdTbKIWIDP6f5oXtBDLnSxgn -XpG8Y1sCKMqvZVEYc2gG4PEJU1lmwKTXu0vZD8mAOWp6pA6fLQNtFfSdooUVUvP3 -5U3SLKZ3vecYYj7W3P0W00PWEMvw0KFBlu/fbo6MJZl7cXOHYgyDsLj4KOH8P+Fi -HeOg9BKfT1DoKbBteCrasq4W4g6rKRt+Enf7X336H4hRuR0pLa1xihOKdFquU+3F -5vKF8r/hx4btdfrpX7Y1sfTIINxxSG2zlRlp5V34X5kIijzGe+ekxg0putzcp0cj -Ugye2pEE3Gc6+QDmaM521WmHhznTmJwHtGqxWY8yGvJi1a9+2+RaLZq7pB+7A27v -x7sGMJG5drVY7I2x51lVbV9HmHxUTmmCsYw72wl0aHMNUkFk48g= -=iSB3 ------END PGP SIGNATURE----- diff --git a/libvirt-7.7.0.tar.xz b/libvirt-7.7.0.tar.xz new file mode 100644 index 0000000..7db2292 --- /dev/null +++ b/libvirt-7.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2 +size 8670212 diff --git a/libvirt-7.7.0.tar.xz.asc b/libvirt-7.7.0.tar.xz.asc new file mode 100644 index 0000000..4ed3669 --- /dev/null +++ b/libvirt-7.7.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmEvaDQACgkQymi+gBAI +TJwpKA//aaK59E+5/3s4vWpbhc5bPJdfR3lJh5Zyr0pJwrjCo+e8e5vYhGWxnaNw +7mSIy5yB1qktD3z1x+g/lG7ig28a3479HdjMXLXYaFSO/vrJqA2yBRuC34XFvoww +3rKKQkD4xneFF9VWDsWLFjlnhWLAfQbQszbcCDM/EIELWT9okE2Wz8jY7xMJV8NT +nSz2uLB7djcGuUn+IF6snEtL7Crr+YTeR6SoAvGpLCldu2dSWcUwGYBXJy6Up86k +z4ITVFx+MV2tO5Mp0NHoinNwa2f8KQJ9PqkepcIeCvhDMiT87cQyjcH1sT9nW2cB +am3svLGim6rFrEisKwyptcYy6XLr5XTu2veQhTgXfz+iSzCXJ6KuttLS8WK1LGkF +iqCphPNji32/APmw9WPDnE49Zk38GgCsBVmx/M2dA5DgDwHxdts4YkiteOvbxmKN +bdc9Vwkc7aGGzXhCBHBbDcbWm715ks6k8uELZB9h0hE9OFodNCWc8b3bn9EnPGUp +ng3nrqotIzaQl381RCmzblChvoufj0aIvIQnUhNMptZvtoGhCe6kNKBERVP8JICZ +OeAZmVTRxIGf9262ooxZVSjVzGVlX6p51wLYwPi2RFOQEG8/Ic89ECa4vTZttyEd +vasxYrb5H9fHlvCkW3eBYOaRBlknlI3AtB2s4LqevH9kpN6S4U0= +=OGVq +-----END PGP SIGNATURE----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index f8be368..46540db 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-7.6.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-7.7.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-7.6.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-7.6.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-7.7.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-7.7.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 75d6225..e789695 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,8 +1,8 @@ -Index: libvirt-7.6.0/tools/virsh.c +Index: libvirt-7.7.0/tools/virsh.c =================================================================== ---- libvirt-7.6.0.orig/tools/virsh.c -+++ libvirt-7.6.0/tools/virsh.c -@@ -545,6 +545,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ +--- libvirt-7.7.0.orig/tools/virsh.c ++++ libvirt-7.7.0/tools/virsh.c +@@ -544,6 +544,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -11,10 +11,10 @@ Index: libvirt-7.6.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-7.6.0/src/interface/interface_backend_netcf.c +Index: libvirt-7.7.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-7.6.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-7.6.0/src/interface/interface_backend_netcf.c +--- libvirt-7.7.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-7.7.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include @@ -126,10 +126,10 @@ Index: libvirt-7.6.0/src/interface/interface_backend_netcf.c if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-7.6.0/src/interface/interface_driver.c +Index: libvirt-7.7.0/src/interface/interface_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/interface/interface_driver.c -+++ libvirt-7.6.0/src/interface/interface_driver.c +--- libvirt-7.7.0.orig/src/interface/interface_driver.c ++++ libvirt-7.7.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ Index: libvirt-7.6.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-7.6.0/meson.build +Index: libvirt-7.7.0/meson.build =================================================================== ---- libvirt-7.6.0.orig/meson.build -+++ libvirt-7.6.0/meson.build +--- libvirt-7.7.0.orig/meson.build ++++ libvirt-7.7.0/meson.build @@ -1088,6 +1088,12 @@ else netcf_dep = dependency('', required: false) endif @@ -177,7 +177,7 @@ Index: libvirt-7.6.0/meson.build endif if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') -@@ -2333,6 +2339,7 @@ libs_summary = { +@@ -2334,6 +2340,7 @@ libs_summary = { 'libssh2': libssh2_dep.found(), 'libutil': libutil_dep.found(), 'netcf': conf.has('WITH_NETCF'), @@ -185,10 +185,10 @@ Index: libvirt-7.6.0/meson.build 'NLS': have_gnu_gettext_tools, 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), -Index: libvirt-7.6.0/src/interface/meson.build +Index: libvirt-7.7.0/src/interface/meson.build =================================================================== ---- libvirt-7.6.0.orig/src/interface/meson.build -+++ libvirt-7.6.0/src/interface/meson.build +--- libvirt-7.7.0.orig/src/interface/meson.build ++++ libvirt-7.7.0/src/interface/meson.build @@ -2,7 +2,7 @@ interface_driver_sources = [ 'interface_driver.c', ] @@ -206,10 +206,10 @@ Index: libvirt-7.6.0/src/interface/meson.build udev_dep, ], 'link_args': [ -Index: libvirt-7.6.0/meson_options.txt +Index: libvirt-7.7.0/meson_options.txt =================================================================== ---- libvirt-7.6.0.orig/meson_options.txt -+++ libvirt-7.6.0/meson_options.txt +--- libvirt-7.7.0.orig/meson_options.txt ++++ libvirt-7.7.0/meson_options.txt @@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value option('libssh', type: 'feature', value: 'auto', description: 'libssh support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') diff --git a/libvirt.changes b/libvirt.changes index 9dbf882..dcfb863 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 1 14:21:30 UTC 2021 - James Fehlig + +- Update to libvirt 7.7.0 + - jsc#SLE-18446 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + ------------------------------------------------------------------- Wed Aug 11 17:31:50 UTC 2021 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index b668990..38276d9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -136,7 +136,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 7.6.0 +Version: 7.7.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index d596d60..2ff0293 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-7.6.0/src/libxl/libxl_driver.c +Index: libvirt-7.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.6.0/src/libxl/libxl_driver.c +--- libvirt-7.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.7.0/src/libxl/libxl_driver.c @@ -1347,6 +1347,63 @@ libxlDomainReboot(virDomainPtr dom, unsi } diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index 1ea4e39..67e0ab0 100644 --- a/libxl-set-cach-mode.patch +++ b/libxl-set-cach-mode.patch @@ -3,12 +3,12 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425 src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-7.6.0/src/libxl/libxl_conf.c +Index: libvirt-7.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.6.0/src/libxl/libxl_conf.c -@@ -951,6 +951,30 @@ libxlDiskSetDiscard(libxl_device_disk *x - #endif +--- libvirt-7.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.7.0/src/libxl/libxl_conf.c +@@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x + } } +static void @@ -21,11 +21,9 @@ Index: libvirt-7.6.0/src/libxl/libxl_conf.c + x_disk->readwrite = (x_disk->readwrite & LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MASK) | LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MAGIC; + break; +#endif -+#if defined(LIBXL_HAVE_DEVICE_DISK_DIRECT_IO_SAFE) + case VIR_DOMAIN_DISK_CACHE_DIRECTSYNC: + x_disk->direct_io_safe = true; + break; -+#endif + case VIR_DOMAIN_DISK_CACHE_DEFAULT: + case VIR_DOMAIN_DISK_CACHE_DISABLE: + case VIR_DOMAIN_DISK_CACHE_WRITETHRU: @@ -38,10 +36,10 @@ Index: libvirt-7.6.0/src/libxl/libxl_conf.c static char * libxlMakeNetworkDiskSrcStr(virStorageSource *src, const char *username, -@@ -1191,6 +1215,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, +@@ -1180,6 +1202,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, + x_disk->readwrite = !l_disk->src->readonly; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; - if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) - return -1; + libxlDiskSetDiscard(x_disk, l_disk->discard); + libxlDiskSetCacheMode(x_disk, l_disk->cachemode); /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index 411d9dc..8719c5c 100644 --- a/libxl-set-migration-constraints.patch +++ b/libxl-set-migration-constraints.patch @@ -16,11 +16,11 @@ Signed-off-by: Jim Fehlig tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-7.6.0/docs/manpages/virsh.rst +Index: libvirt-7.7.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-7.6.0.orig/docs/manpages/virsh.rst -+++ libvirt-7.6.0/docs/manpages/virsh.rst -@@ -3184,7 +3184,8 @@ migrate +--- libvirt-7.7.0.orig/docs/manpages/virsh.rst ++++ libvirt-7.7.0/docs/manpages/virsh.rst +@@ -3167,7 +3167,8 @@ migrate [--postcopy-bandwidth bandwidth] [--parallel [--parallel-connections connections]] [--bandwidth bandwidth] [--tls-destination hostname] @@ -30,7 +30,7 @@ Index: libvirt-7.6.0/docs/manpages/virsh.rst Migrate domain to another host. Add *--live* for live migration; <--p2p> for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled* -@@ -3290,6 +3291,12 @@ parallel connections. The number of such +@@ -3273,6 +3274,12 @@ parallel connections. The number of such network link between the source and the target and thus speeding up the migration. @@ -43,10 +43,10 @@ Index: libvirt-7.6.0/docs/manpages/virsh.rst Running migration can be canceled by interrupting virsh (usually using ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance. -Index: libvirt-7.6.0/include/libvirt/libvirt-domain.h +Index: libvirt-7.7.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-7.6.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-7.6.0/include/libvirt/libvirt-domain.h +--- libvirt-7.7.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-7.7.0/include/libvirt/libvirt-domain.h @@ -1079,6 +1079,25 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" @@ -73,10 +73,10 @@ Index: libvirt-7.6.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-7.6.0/src/libxl/libxl_driver.c +Index: libvirt-7.7.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.6.0/src/libxl/libxl_driver.c +--- libvirt-7.7.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.7.0/src/libxl/libxl_driver.c @@ -6009,6 +6009,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -117,11 +117,11 @@ Index: libvirt-7.6.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-7.6.0/src/libxl/libxl_migration.c +Index: libvirt-7.7.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_migration.c -+++ libvirt-7.6.0/src/libxl/libxl_migration.c -@@ -340,18 +340,38 @@ libxlMigrateDstReceive(virNetSocket *soc +--- libvirt-7.7.0.orig/src/libxl/libxl_migration.c ++++ libvirt-7.7.0/src/libxl/libxl_migration.c +@@ -334,18 +334,38 @@ libxlMigrateDstReceive(virNetSocket *soc static int libxlDoMigrateSrcSend(libxlDriverPrivate *driver, virDomainObj *vm, @@ -162,7 +162,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -893,7 +913,7 @@ struct libxlTunnelControl { +@@ -887,7 +907,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver, virDomainObj *vm, @@ -171,7 +171,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -926,7 +946,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -920,7 +940,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -180,7 +180,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c virObjectLock(vm); out: -@@ -962,7 +982,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -956,7 +976,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate const char *dconnuri G_GNUC_UNUSED, const char *dname, const char *uri, @@ -189,7 +189,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -1007,11 +1027,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1001,11 +1021,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perspective. */ @@ -203,7 +203,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c if (!(st = virStreamNew(dconn, 0))) goto confirm; ret = dconn->driver->domainMigratePrepareTunnel3Params -@@ -1025,7 +1045,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1019,7 +1039,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate if (ret == -1) goto confirm; @@ -212,7 +212,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1040,11 +1060,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1034,11 +1054,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -227,7 +227,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c if (ret < 0) { notify_source = false; virErrorPreserveLast(&orig_err); -@@ -1079,7 +1099,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1073,7 +1093,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate confirm: if (notify_source) { VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -236,7 +236,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", -@@ -1087,7 +1107,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1081,7 +1101,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate } cleanup: @@ -245,7 +245,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1131,7 +1151,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1125,7 +1145,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str G_GNUC_UNUSED, const char *dname, @@ -254,7 +254,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c { int ret = -1; int useParams; -@@ -1168,7 +1188,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1162,7 +1182,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -263,7 +263,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c if (ret < 0) { /* -@@ -1195,7 +1215,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1189,7 +1209,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri G_GNUC_UNUSED, const char *uri_str, const char *dname G_GNUC_UNUSED, @@ -272,7 +272,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c { libxlDomainObjPrivate *priv = vm->privateData; char *hostname = NULL; -@@ -1231,7 +1251,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1225,7 +1245,7 @@ libxlDomainMigrationSrcPerform(libxlDriv /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -281,10 +281,10 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.c virObjectLock(vm); if (ret == 0) { -Index: libvirt-7.6.0/src/libxl/libxl_migration.h +Index: libvirt-7.7.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_migration.h -+++ libvirt-7.6.0/src/libxl/libxl_migration.h +--- libvirt-7.7.0.orig/src/libxl/libxl_migration.h ++++ libvirt-7.7.0/src/libxl/libxl_migration.h @@ -35,6 +35,9 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -327,11 +327,11 @@ Index: libvirt-7.6.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-7.6.0/tools/virsh-domain.c +Index: libvirt-7.7.0/tools/virsh-domain.c =================================================================== ---- libvirt-7.6.0.orig/tools/virsh-domain.c -+++ libvirt-7.6.0/tools/virsh-domain.c -@@ -10677,6 +10677,18 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-7.7.0.orig/tools/virsh-domain.c ++++ libvirt-7.7.0/tools/virsh-domain.c +@@ -10439,6 +10439,18 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_STRING, .help = N_("override the destination host name used for TLS verification") }, @@ -350,7 +350,7 @@ Index: libvirt-7.6.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10697,6 +10709,7 @@ doMigrate(void *opaque) +@@ -10459,6 +10471,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -358,7 +358,7 @@ Index: libvirt-7.6.0/tools/virsh-domain.c #ifndef WIN32 sigset_t sigmask, oldsigmask; -@@ -10827,6 +10840,22 @@ doMigrate(void *opaque) +@@ -10589,6 +10602,22 @@ doMigrate(void *opaque) goto save_error; } diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index b286abb..4318e48 100644 --- a/libxl-support-block-script.patch +++ b/libxl-support-block-script.patch @@ -7,19 +7,18 @@ and npiv. For more details, see bsc#954872 and FATE#319810 -Index: libvirt-7.6.0/src/libxl/libxl_conf.c +Index: libvirt-7.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.6.0/src/libxl/libxl_conf.c -@@ -951,6 +951,22 @@ libxlDiskSetDiscard(libxl_device_disk *x - #endif +--- libvirt-7.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.7.0/src/libxl/libxl_conf.c +@@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x } -+static int + static void +libxlDiskSetScript(libxl_device_disk *x_disk, const char *disk_spec) +{ + if (disk_spec == NULL) -+ return 0; ++ return; + + if (STRPREFIX(disk_spec, "dmmd:")) + x_disk->script = g_strdup("block-dmmd"); @@ -27,14 +26,13 @@ Index: libvirt-7.6.0/src/libxl/libxl_conf.c + x_disk->script = g_strdup("block-drbd"); + else if (STRPREFIX(disk_spec, "npiv:")) + x_disk->script = g_strdup("block-npiv"); -+ -+ return 0; +} + - static void ++static void libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) { -@@ -1096,6 +1112,7 @@ libxlMakeNetworkDiskSrc(virStorageSource + switch (cachemode) { +@@ -1084,6 +1098,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) { @@ -42,7 +40,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_conf.c const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1109,7 +1126,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, +@@ -1097,7 +1112,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -51,12 +49,11 @@ Index: libvirt-7.6.0/src/libxl/libxl_conf.c } x_disk->vdev = g_strdup(l_disk->dst); -@@ -1216,6 +1233,9 @@ libxlMakeDisk(virDomainDiskDef *l_disk, - if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) - return -1; +@@ -1203,6 +1218,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk, + x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; + libxlDiskSetDiscard(x_disk, l_disk->discard); libxlDiskSetCacheMode(x_disk, l_disk->cachemode); -+ if (libxlDiskSetScript(x_disk, src) < 0) -+ return -1; ++ libxlDiskSetScript(x_disk, src); + /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index e5af757..ff6fd63 100644 --- a/lxc-wait-after-eth-del.patch +++ b/lxc-wait-after-eth-del.patch @@ -13,11 +13,11 @@ device with the same name that is being created. src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-7.6.0/src/lxc/lxc_controller.c +Index: libvirt-7.7.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-7.6.0.orig/src/lxc/lxc_controller.c -+++ libvirt-7.6.0/src/lxc/lxc_controller.c -@@ -2013,6 +2013,7 @@ static int virLXCControllerDeleteInterfa +--- libvirt-7.7.0.orig/src/lxc/lxc_controller.c ++++ libvirt-7.7.0/src/lxc/lxc_controller.c +@@ -2012,6 +2012,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -25,10 +25,10 @@ Index: libvirt-7.6.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-7.6.0/src/lxc/lxc_driver.c +Index: libvirt-7.7.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.6.0/src/lxc/lxc_driver.c +--- libvirt-7.7.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.7.0/src/lxc/lxc_driver.c @@ -67,6 +67,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -53,10 +53,10 @@ Index: libvirt-7.6.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-7.6.0/src/lxc/lxc_process.c +Index: libvirt-7.7.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-7.6.0.orig/src/lxc/lxc_process.c -+++ libvirt-7.6.0/src/lxc/lxc_process.c +--- libvirt-7.7.0.orig/src/lxc/lxc_process.c ++++ libvirt-7.7.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "virstring.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 f0b053a..6462fc9 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-7.6.0/src/network/bridge_driver.c +Index: libvirt-7.7.0/src/network/bridge_driver.c =================================================================== ---- libvirt-7.6.0.orig/src/network/bridge_driver.c -+++ libvirt-7.6.0/src/network/bridge_driver.c -@@ -1482,7 +1482,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-7.7.0.orig/src/network/bridge_driver.c ++++ libvirt-7.7.0/src/network/bridge_driver.c +@@ -1480,7 +1480,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-7.6.0/src/network/bridge_driver.c } if (ipdef->tftproot) { -Index: libvirt-7.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-7.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-7.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-7.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-7.7.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-7.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 3625924..ed685c8 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-7.6.0/src/util/virarch.c +Index: libvirt-7.7.0/src/util/virarch.c =================================================================== ---- libvirt-7.6.0.orig/src/util/virarch.c -+++ libvirt-7.6.0/src/util/virarch.c +--- libvirt-7.7.0.orig/src/util/virarch.c ++++ libvirt-7.7.0/src/util/virarch.c @@ -220,6 +220,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 81f16cc..909ecdc 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-7.6.0/src/security/apparmor/libvirt-qemu +Index: libvirt-7.7.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-7.6.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-7.6.0/src/security/apparmor/libvirt-qemu +--- libvirt-7.7.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-7.7.0/src/security/apparmor/libvirt-qemu @@ -248,3 +248,6 @@ # /sys/bus/nd/devices / r, # harmless on any lsb compliant system diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch index 6b25e05..0738a59 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-7.6.0/tools/libvirt-guests.sh.in +Index: libvirt-7.7.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-7.6.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-7.6.0/tools/libvirt-guests.sh.in +--- libvirt-7.7.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-7.7.0/tools/libvirt-guests.sh.in @@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@" localstatedir="@localstatedir@" libvirtd="@sbindir@"/libvirtd diff --git a/suse-libvirtd-disable-tls.patch b/suse-libvirtd-disable-tls.patch index 88c3194..aecbb72 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-7.6.0/src/remote/remote_daemon_config.c +Index: libvirt-7.7.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-7.6.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-7.6.0/src/remote/remote_daemon_config.c +--- libvirt-7.7.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-7.7.0/src/remote/remote_daemon_config.c @@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U #ifdef WITH_IP @@ -16,10 +16,10 @@ Index: libvirt-7.6.0/src/remote/remote_daemon_config.c # else /* ! LIBVIRTD */ data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-7.6.0/src/remote/libvirtd.conf.in +Index: libvirt-7.7.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-7.6.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-7.6.0/src/remote/libvirtd.conf.in +--- libvirt-7.7.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-7.7.0/src/remote/libvirtd.conf.in @@ -17,8 +17,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -31,10 +31,10 @@ Index: libvirt-7.6.0/src/remote/libvirtd.conf.in # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to -Index: libvirt-7.6.0/src/remote/test_libvirtd.aug.in +Index: libvirt-7.7.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-7.6.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-7.6.0/src/remote/test_libvirtd.aug.in +--- libvirt-7.7.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-7.7.0/src/remote/test_libvirtd.aug.in @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ = test @DAEMON_NAME_UC@.lns get conf = diff --git a/suse-libxl-disable-autoballoon.patch b/suse-libxl-disable-autoballoon.patch index 2c24c9f..c3c903f 100644 --- a/suse-libxl-disable-autoballoon.patch +++ b/suse-libxl-disable-autoballoon.patch @@ -6,10 +6,10 @@ autoballooning. This patch changes libvirt to also disable autoballooning by default. It can only be enabled with the 'autoballoon' setting in libxl.conf. See jsc#SLE-3059 for more details. -Index: libvirt-7.6.0/src/libxl/libxl.conf +Index: libvirt-7.7.0/src/libxl/libxl.conf =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl.conf -+++ libvirt-7.6.0/src/libxl/libxl.conf +--- libvirt-7.7.0.orig/src/libxl/libxl.conf ++++ libvirt-7.7.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,11 +27,11 @@ Index: libvirt-7.6.0/src/libxl/libxl.conf # In order to prevent accidentally starting two domains that -Index: libvirt-7.6.0/src/libxl/libxl_conf.c +Index: libvirt-7.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.6.0/src/libxl/libxl_conf.c -@@ -1762,15 +1762,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa +--- libvirt-7.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.7.0/src/libxl/libxl_conf.c +@@ -1746,15 +1746,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified * setting in libxl.conf first. If not specified, autoballooning @@ -48,7 +48,7 @@ Index: libvirt-7.6.0/src/libxl/libxl_conf.c int res; res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); -@@ -1779,15 +1776,8 @@ libxlGetAutoballoonConf(libxlDriverConfi +@@ -1763,15 +1760,8 @@ libxlGetAutoballoonConf(libxlDriverConfi else if (res == 1) return 0; @@ -66,10 +66,10 @@ Index: libvirt-7.6.0/src/libxl/libxl_conf.c return 0; } -Index: libvirt-7.6.0/src/libxl/test_libvirtd_libxl.aug.in +Index: libvirt-7.7.0/src/libxl/test_libvirtd_libxl.aug.in =================================================================== ---- libvirt-7.6.0.orig/src/libxl/test_libvirtd_libxl.aug.in -+++ libvirt-7.6.0/src/libxl/test_libvirtd_libxl.aug.in +--- libvirt-7.7.0.orig/src/libxl/test_libvirtd_libxl.aug.in ++++ libvirt-7.7.0/src/libxl/test_libvirtd_libxl.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd_libxl = @CONFIG@ diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 5c0d8b5..9f53f1d 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -7,10 +7,10 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch, etc.), but for now they are all lumped together in this single patch. -Index: libvirt-7.6.0/src/qemu/qemu.conf +Index: libvirt-7.7.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.6.0.orig/src/qemu/qemu.conf -+++ libvirt-7.6.0/src/qemu/qemu.conf +--- libvirt-7.7.0.orig/src/qemu/qemu.conf ++++ libvirt-7.7.0/src/qemu/qemu.conf @@ -491,10 +491,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,10 +60,10 @@ Index: libvirt-7.6.0/src/qemu/qemu.conf # #lock_manager = "lockd" -Index: libvirt-7.6.0/src/qemu/qemu_conf.c +Index: libvirt-7.7.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.6.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.6.0/src/qemu/qemu_conf.c +--- libvirt-7.7.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.7.0/src/qemu/qemu_conf.c @@ -272,7 +272,7 @@ virQEMUDriverConfig *virQEMUDriverConfig cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON); @@ -73,10 +73,10 @@ Index: libvirt-7.6.0/src/qemu/qemu_conf.c cfg->securityRequireConfined = false; cfg->keepAliveInterval = 5; -Index: libvirt-7.6.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.6.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in @@ -45,6 +45,7 @@ module Test_libvirtd_qemu = { "remote_websocket_port_min" = "5700" } { "remote_websocket_port_max" = "65535" } diff --git a/suse-qemu-ovmf-paths.patch b/suse-qemu-ovmf-paths.patch index 85006e6..a85bdf1 100644 --- a/suse-qemu-ovmf-paths.patch +++ b/suse-qemu-ovmf-paths.patch @@ -5,10 +5,10 @@ advertised and used by libvirt are automatically detected. Until upstream removes the old DEFAULT_LOADER_NVRAM approach and associated code, this patch will stay. -Index: libvirt-7.6.0/src/qemu/qemu.conf +Index: libvirt-7.7.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.6.0.orig/src/qemu/qemu.conf -+++ libvirt-7.6.0/src/qemu/qemu.conf +--- libvirt-7.7.0.orig/src/qemu/qemu.conf ++++ libvirt-7.7.0/src/qemu/qemu.conf @@ -858,10 +858,9 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. @@ -23,10 +23,10 @@ Index: libvirt-7.6.0/src/qemu/qemu.conf #] # The backend to use for handling stdout/stderr output from -Index: libvirt-7.6.0/src/qemu/qemu_conf.c +Index: libvirt-7.7.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.6.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.6.0/src/qemu/qemu_conf.c +--- libvirt-7.7.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.7.0/src/qemu/qemu_conf.c @@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver) #ifndef DEFAULT_LOADER_NVRAM @@ -41,10 +41,10 @@ Index: libvirt-7.6.0/src/qemu/qemu_conf.c #endif -Index: libvirt-7.6.0/src/security/virt-aa-helper.c +Index: libvirt-7.7.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-7.6.0.orig/src/security/virt-aa-helper.c -+++ libvirt-7.6.0/src/security/virt-aa-helper.c +--- libvirt-7.7.0.orig/src/security/virt-aa-helper.c ++++ libvirt-7.7.0/src/security/virt-aa-helper.c @@ -480,7 +480,8 @@ valid_path(const char *path, const bool "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ @@ -55,10 +55,10 @@ Index: libvirt-7.6.0/src/security/virt-aa-helper.c }; /* override the above with these */ const char * const override[] = { -Index: libvirt-7.6.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.6.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.6.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in @@ -96,10 +96,9 @@ module Test_libvirtd_qemu = { "migration_port_max" = "49215" } { "log_timestamp" = "0" } diff --git a/suse-xen-ovmf-paths.patch b/suse-xen-ovmf-paths.patch index d58421c..27469b7 100644 --- a/suse-xen-ovmf-paths.patch +++ b/suse-xen-ovmf-paths.patch @@ -5,11 +5,11 @@ June 2021 ovmf only supports one firmware for Xen. This patch adjusts the firmware path to match the one provided by the ovmf package. -Index: libvirt-7.6.0/src/libxl/libxl_conf.c +Index: libvirt-7.7.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.6.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.6.0/src/libxl/libxl_conf.c -@@ -1813,7 +1813,7 @@ libxlDriverConfigNew(void) +--- libvirt-7.7.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.7.0/src/libxl/libxl_conf.c +@@ -1797,7 +1797,7 @@ libxlDriverConfigNew(void) cfg->firmwares = g_new0(virFirmware *, 1); cfg->nfirmwares = 1; cfg->firmwares[0] = g_new0(virFirmware, 1); diff --git a/virt-create-rootfs.patch b/virt-create-rootfs.patch index 6544ff9..eb260ad 100644 --- a/virt-create-rootfs.patch +++ b/virt-create-rootfs.patch @@ -1,7 +1,7 @@ -Index: libvirt-7.6.0/tools/virt-create-rootfs +Index: libvirt-7.7.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-7.6.0/tools/virt-create-rootfs ++++ libvirt-7.7.0/tools/virt-create-rootfs @@ -0,0 +1,231 @@ +#!/bin/sh +set -e @@ -234,10 +234,10 @@ Index: libvirt-7.6.0/tools/virt-create-rootfs + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-7.6.0/docs/manpages/virt-create-rootfs.rst +Index: libvirt-7.7.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-7.6.0/docs/manpages/virt-create-rootfs.rst ++++ libvirt-7.7.0/docs/manpages/virt-create-rootfs.rst @@ -0,0 +1,88 @@ +================== +virt-create-rootfs @@ -327,10 +327,10 @@ Index: libvirt-7.6.0/docs/manpages/virt-create-rootfs.rst +======== + +virsh(1), `https://libvirt.org/ `_ -Index: libvirt-7.6.0/docs/manpages/meson.build +Index: libvirt-7.7.0/docs/manpages/meson.build =================================================================== ---- libvirt-7.6.0.orig/docs/manpages/meson.build -+++ libvirt-7.6.0/docs/manpages/meson.build +--- libvirt-7.7.0.orig/docs/manpages/meson.build ++++ libvirt-7.7.0/docs/manpages/meson.build @@ -19,6 +19,7 @@ docs_man_files = [ { 'name': 'virt-pki-validate', 'section': '1', 'install': true }, { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, @@ -339,10 +339,10 @@ Index: libvirt-7.6.0/docs/manpages/meson.build { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, -Index: libvirt-7.6.0/tools/meson.build +Index: libvirt-7.7.0/tools/meson.build =================================================================== ---- libvirt-7.6.0.orig/tools/meson.build -+++ libvirt-7.6.0/tools/meson.build +--- libvirt-7.7.0.orig/tools/meson.build ++++ libvirt-7.7.0/tools/meson.build @@ -149,6 +149,8 @@ else virsh_icon_res = [] endif