Accepting request 864469 from home:jfehlig:branches:Virtualization

- Update to libvirt 7.0.0 - jsc#SLE-15860 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html - Dropped patches: 0d05d51b-apparmor-lxc-fix.patch, cf4e7e62-lxc-def-secmodel.patch, 0ddebdb4-qemu-snapshot-deletion.patch OBS-URL: https://build.opensuse.org/request/show/864469 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=870
2021-01-19 23:09:19 +00:00 · 2021-01-19 23:09:19 +00:00 · 4e130a6e0c
commit 4e130a6e0c
parent 3436bacc46
34 changed files with 272 additions and 433 deletions
--- 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-6.10.0/src/conf/domain_stats.c
+Index: libvirt-7.0.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-6.10.0/src/conf/domain_stats.c
+++ libvirt-7.0.0/src/conf/domain_stats.c
@@ -0,0 +1,119 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -142,10 +142,10 @@ Index: libvirt-6.10.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-6.10.0/src/conf/domain_stats.h
+Index: libvirt-7.0.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-6.10.0/src/conf/domain_stats.h
+++ libvirt-7.0.0/src/conf/domain_stats.h
@@ -0,0 +1,62 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -209,21 +209,29 @@ Index: libvirt-6.10.0/src/conf/domain_stats.h
 +                           virTypedParamListPtr params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-6.10.0/src/libvirt_private.syms
+Index: libvirt-7.0.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-6.10.0.orig/src/libvirt_private.syms
-+++ libvirt-6.10.0/src/libvirt_private.syms
-@@ -744,6 +744,9 @@ virDomainConfNWFilterInstantiate;
- virDomainConfNWFilterTeardown;
+--- libvirt-7.0.0.orig/src/libvirt_private.syms
+++ libvirt-7.0.0/src/libvirt_private.syms
+@@ -741,12 +741,16 @@ virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
+ 
 +# conf/domain_stats.h
 +virDomainStatsGetInterface;
 +virDomainStatsGetState;
+
+
+ # conf/domain_validate.h
+ virDomainActualNetDefValidate;
+ virDomainDefValidate;
+ virDomainDeviceValidateAliasForHotplug;
 
+-
 # conf/interface_conf.h
 virInterfaceDefFormat;
-@@ -1793,6 +1796,7 @@ virCgroupGetMemoryUsage;
+ virInterfaceDefFree;
+@@ -1796,6 +1800,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -231,10 +239,10 @@ Index: libvirt-6.10.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKillPainfully;
-Index: libvirt-6.10.0/src/qemu/qemu_driver.c
+Index: libvirt-7.0.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-6.10.0/src/qemu/qemu_driver.c
+--- libvirt-7.0.0.orig/src/qemu/qemu_driver.c
+++ libvirt-7.0.0/src/qemu/qemu_driver.c
@@ -67,6 +67,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
@ -243,7 +251,7 @@ Index: libvirt-6.10.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_driver.h"
-@@ -17597,13 +17598,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -17614,13 +17615,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                         virTypedParamListPtr params,
                         unsigned int privflags G_GNUC_UNUSED)
 {
@ -258,7 +266,7 @@ Index: libvirt-6.10.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -17897,25 +17892,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -17914,25 +17909,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
                             virTypedParamListPtr params)
 {
     qemuDomainObjPrivatePtr priv = dom->privateData;
@ -285,7 +293,7 @@ Index: libvirt-6.10.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -18082,76 +18063,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -18099,76 +18080,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
     return ret;
 }
 
@ -363,10 +371,10 @@ Index: libvirt-6.10.0/src/qemu/qemu_driver.c
 
 /* refresh information by opening images on the disk */
 static int
-Index: libvirt-6.10.0/src/util/vircgroup.c
+Index: libvirt-7.0.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-6.10.0.orig/src/util/vircgroup.c
-+++ libvirt-6.10.0/src/util/vircgroup.c
+--- libvirt-7.0.0.orig/src/util/vircgroup.c
+++ libvirt-7.0.0/src/util/vircgroup.c
@@ -2799,6 +2799,31 @@ virCgroupControllerAvailable(int control
     return virCgroupHasController(cgroup, controller);
 }
@ -414,10 +422,10 @@ Index: libvirt-6.10.0/src/util/vircgroup.c
 int
 virCgroupNewPartition(const char *path G_GNUC_UNUSED,
                       bool create G_GNUC_UNUSED,
-Index: libvirt-6.10.0/src/util/vircgroup.h
+Index: libvirt-7.0.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-6.10.0.orig/src/util/vircgroup.h
-+++ libvirt-6.10.0/src/util/vircgroup.h
+--- libvirt-7.0.0.orig/src/util/vircgroup.h
+++ libvirt-7.0.0/src/util/vircgroup.h
@@ -23,6 +23,7 @@
 
 #include "virbitmap.h"
@ -426,21 +434,21 @@ Index: libvirt-6.10.0/src/util/vircgroup.h
 
 struct _virCgroup;
 typedef struct _virCgroup virCgroup;
-@@ -277,3 +278,6 @@ int virCgroupSetOwner(virCgroupPtr cgrou
+@@ -284,3 +285,6 @@ int virCgroupSetOwner(virCgroupPtr cgrou
 int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
 
 bool virCgroupControllerAvailable(int controller);
 +
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virTypedParamListPtr params);
-Index: libvirt-6.10.0/src/conf/meson.build
+Index: libvirt-7.0.0/src/conf/meson.build
 ===================================================================
--- libvirt-6.10.0.orig/src/conf/meson.build
-+++ libvirt-6.10.0/src/conf/meson.build
-@@ -14,6 +14,7 @@ domain_conf_sources = [
-   'domain_capabilities.c',
+--- libvirt-7.0.0.orig/src/conf/meson.build
+++ libvirt-7.0.0/src/conf/meson.build
+@@ -15,6 +15,7 @@ domain_conf_sources = [
   'domain_conf.c',
   'domain_nwfilter.c',
+   'domain_validate.c',
 +  'domain_stats.c',
   'moment_conf.c',
   'numa_conf.c',
--- a/0001-libxl-add-support-for-BlockResize-API.patch
+++ b/0001-libxl-add-support-for-BlockResize-API.patch
@ -19,11 +19,11 @@ reworking this patch and submitting it to upstream libvirt.
 src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

-Index: libvirt-6.10.0/src/libxl/libxl_driver.c
+Index: libvirt-7.0.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.10.0/src/libxl/libxl_driver.c
-@@ -5322,6 +5322,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-7.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.0.0/src/libxl/libxl_driver.c
+@@ -5317,6 +5317,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
 
@ -120,7 +120,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_driver.c
 static int
 libxlDomainGetJobInfo(virDomainPtr dom,
                       virDomainJobInfoPtr info)
-@@ -6794,6 +6884,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6786,6 +6876,7 @@ static virHypervisorDriver libxlHypervis
 #endif
     .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
     .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
--- a/0002-lxc-implement-connectGetAllDomainStats.patch
+++ b/0002-lxc-implement-connectGetAllDomainStats.patch
@ -9,11 +9,11 @@ them using the existing API.
 src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

-Index: libvirt-6.10.0/src/lxc/lxc_driver.c
+Index: libvirt-7.0.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.10.0/src/lxc/lxc_driver.c
-@@ -73,6 +73,8 @@
+--- libvirt-7.0.0.orig/src/lxc/lxc_driver.c
+++ libvirt-7.0.0/src/lxc/lxc_driver.c
+@@ -74,6 +74,8 @@
 #include "netdev_bandwidth_conf.h"
 #include "virsocket.h"
 #include "virutil.h"
@ -22,7 +22,7 @@ Index: libvirt-6.10.0/src/lxc/lxc_driver.c
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
-@@ -5071,6 +5073,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5065,6 +5067,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
     return ret;
 }
 
@ -151,7 +151,7 @@ Index: libvirt-6.10.0/src/lxc/lxc_driver.c
 
 /* Function Tables */
 static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5168,6 +5292,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5162,6 +5286,7 @@ static virHypervisorDriver lxcHypervisor
     .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
     .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
     .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */
--- a/0d05d51b-apparmor-lxc-fix.patch
+++ b/0d05d51b-apparmor-lxc-fix.patch
@ -1,40 +0,0 @@
-commit 0d05d51b715390e08cd112f83e03b6776412aaeb
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Wed Dec 2 16:24:21 2020 -0700
-
-    apparmor: Allow lxc processes to receive signals from libvirt
-    
-    LXC processes confined by apparmor are not permitted to receive signals
-    from libvirtd. Attempting to destroy such a process fails
-    
-    virsh --connect lxc:/// destroy distro_apparmor
-     error: Failed to destroy domain distro_apparmor
-     error: Failed to kill process 29491: Permission denied
-    
-    And from /var/log/audit/audit.log
-    
-    type=AVC msg=audit(1606949706.142:6345): apparmor="DENIED"
-    operation="signal" profile="libvirt-314b7109-fdce-48dc-ad28-7c47958a27c1"
-    pid=29390 comm="libvirtd" requested_mask="receive" denied_mask="receive"
-    signal=term peer="libvirtd"
-    
-    Similar to the libvirt-qemu abstraction, add a rule to the libvirt-lxc
-    abstraction allowing reception of signals from libvirtd.
-    
-    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-    Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-
-Index: libvirt-6.10.0/src/security/apparmor/libvirt-lxc
-===================================================================
--- libvirt-6.10.0.orig/src/security/apparmor/libvirt-lxc
-+++ libvirt-6.10.0/src/security/apparmor/libvirt-lxc
-@@ -1,5 +1,9 @@
-   #include <abstractions/base>
- 
-+ # Allow receiving signals from libvirtd
-+  signal (receive) peer=libvirtd,
-+  signal (receive) peer=/usr/sbin/libvirtd,
-+
-   umount,
- 
-   # ignore DENIED message on / remount
--- a/0ddebdb4-qemu-snapshot-deletion.patch
+++ b/0ddebdb4-qemu-snapshot-deletion.patch
@ -1,30 +0,0 @@
-commit 0ddebdb42e72a984d25793722a60b85c7c7d8f1f
-Author: Peter Krempa <pkrempa@redhat.com>
-Date:   Wed Dec 9 10:08:53 2020 +0100
-
-    qemu: Fix logic bug in inactive snapshot deletion
-    
-    Commit 926563dc3a6 which refactored the function call deleting the
-    snapshot's on disk state introduced a logic bug, which skips over the
-    deletion of libvirt metadata after the disk state deletion is done.
-    
-    To fix it we must not return early.
-    
-    Resolves: https://gitlab.com/libvirt/libvirt/-/issues/109
-    Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-    Reviewed-by: Erik Skultety <eskultet@redhat.com>
-
-Index: libvirt-6.10.0/src/qemu/qemu_domain.c
-===================================================================
--- libvirt-6.10.0.orig/src/qemu/qemu_domain.c
-+++ libvirt-6.10.0/src/qemu/qemu_domain.c
-@@ -6594,7 +6594,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverP
-             if (!def)
-                 def = vm->def;
- 
-            return qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true);
-+            if (qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true) < 0)
-+                return -1;
-         } else {
-             priv = vm->privateData;
-             qemuDomainObjEnterMonitor(driver, vm);
--- a/cf4e7e62-lxc-def-secmodel.patch
+++ b/cf4e7e62-lxc-def-secmodel.patch
@ -1,108 +0,0 @@
-commit cf4e7e620a3ecd109f23c8cdb577893d0e088201
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Thu Dec 3 11:55:24 2020 -0700
-
-    lxc: Set default security model in XML parser config
-    
-    Attempting to create a lxc domain with <seclabel type='none'/> fails
-    
-    virsh --connect lxc:/// create distro_nosec.xml
-    error: Failed to create domain from distro_nosec.xml
-    error: unsupported configuration: Security driver model '(null)' is not available
-    
-    Commit 638ffa2228 adjusted the logic for setting a driver's default
-    security model.
-    
-    The lxc driver does not set a default security driver model in the XML
-    parser config, causing seclabels of type='none' to have a null model.
-    The lxc driver's security manager is initialized in lxcStateInitialize()
-    by calling lxcSecurityInit(). Use the model of this manager as the
-    default in the XML parser config.
-    
-    For the record, this is a regression caused by commit 638ffa2228, which
-    changed the logic for setting a driver's default security model. The
-    qemu driver was adjusted accordingly, but a similar change was missed
-    in the lxc driver.
-    
-    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-    Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Index: libvirt-6.10.0/src/lxc/lxc_conf.c
-===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_conf.c
-+++ libvirt-6.10.0/src/lxc/lxc_conf.c
-@@ -209,9 +209,10 @@ virCapsPtr virLXCDriverGetCapabilities(v
- 
- 
- virDomainXMLOptionPtr
-lxcDomainXMLConfInit(virLXCDriverPtr driver)
-+lxcDomainXMLConfInit(virLXCDriverPtr driver, const char *defsecmodel)
- {
-     virLXCDriverDomainDefParserConfig.priv = driver;
-+    virLXCDriverDomainDefParserConfig.defSecModel = defsecmodel;
-     return virDomainXMLOptionNew(&virLXCDriverDomainDefParserConfig,
-                                  &virLXCDriverPrivateDataCallbacks,
-                                  &virLXCDriverDomainXMLNamespace,
-Index: libvirt-6.10.0/src/lxc/lxc_conf.h
-===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_conf.h
-+++ libvirt-6.10.0/src/lxc/lxc_conf.h
-@@ -112,7 +112,8 @@ int virLXCLoadDriverConfig(virLXCDriverC
- virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver);
- virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr driver,
-                                        bool refresh);
-virDomainXMLOptionPtr lxcDomainXMLConfInit(virLXCDriverPtr driver);
-+virDomainXMLOptionPtr lxcDomainXMLConfInit(virLXCDriverPtr driver,
-+                                           const char *defsecmodel);
- 
- static inline void lxcDriverLock(virLXCDriverPtr driver)
- {
-Index: libvirt-6.10.0/src/lxc/lxc_controller.c
-===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-6.10.0/src/lxc/lxc_controller.c
-@@ -169,7 +169,7 @@ virLXCControllerDriverNew(void)
-     }
- 
-     driver->caps = virLXCDriverCapsInit(NULL);
-    driver->xmlopt = lxcDomainXMLConfInit(driver);
-+    driver->xmlopt = lxcDomainXMLConfInit(driver, NULL);
- 
-     return driver;
- }
-Index: libvirt-6.10.0/src/lxc/lxc_driver.c
-===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.10.0/src/lxc/lxc_driver.c
-@@ -1470,6 +1470,7 @@ static int lxcStateInitialize(bool privi
- {
-     virLXCDriverConfigPtr cfg = NULL;
-     bool autostart = true;
-+    const char *defsecmodel;
- 
-     if (root != NULL) {
-         virReportError(VIR_ERR_INVALID_ARG, "%s",
-@@ -1525,7 +1526,9 @@ static int lxcStateInitialize(bool privi
-     if (!(lxc_driver->hostdevMgr = virHostdevManagerGetDefault()))
-         goto cleanup;
- 
-    if (!(lxc_driver->xmlopt = lxcDomainXMLConfInit(lxc_driver)))
-+    defsecmodel = virSecurityManagerGetModel(lxc_driver->securityManager);
-+
-+    if (!(lxc_driver->xmlopt = lxcDomainXMLConfInit(lxc_driver, defsecmodel)))
-         goto cleanup;
- 
-     if (!(lxc_driver->closeCallbacks = virCloseCallbacksNew()))
-Index: libvirt-6.10.0/tests/testutilslxc.c
-===================================================================
--- libvirt-6.10.0.orig/tests/testutilslxc.c
-+++ libvirt-6.10.0/tests/testutilslxc.c
-@@ -71,7 +71,7 @@ testLXCDriverInit(void)
-     }
- 
-     driver->caps = testLXCCapsInit();
-    driver->xmlopt = lxcDomainXMLConfInit(driver);
-+    driver->xmlopt = lxcDomainXMLConfInit(driver, NULL);
- 
-     return driver;
- }
--- a/libvirt-6.10.0.tar.xz
+++ b/libvirt-6.10.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30cfc1365b7a62bf08c5254103087fac51c4210343aa958a7d38cedd280ed2aa
-size 8462796
--- a/libvirt-6.10.0.tar.xz.asc
+++ b/libvirt-6.10.0.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAl/GBQ0ACgkQymi+gBAI
-TJxI5g/+KwFZ02iJQrC+cgdMvBzYnIGe4ugw1YnFngSXmVtIj0/S5D2AsAN4IaQQ
-TdaSl42S2+t/MiOQ7tUg734690P5tNXe2bzUguiXyO3I8cdQy7MNXd6wUOXGCpTj
-oSaVXmmxTG9Zyu69G0Gam1SLzBsHTKZa4BA3W/wSBtuoJXaeAT9JJLtWFweRQuQB
-G+BigaL5fFkn9lblhc87MI/GdlD2qga5s1ayP5AuS9zZnqFawNHKS5XWrS+OJXKw
-ZMx2LH57kxHo3z2n4JP70A0b3WIkmUPfLnvjB2bjn0BS+WdggXOhDqds8FuM56mB
-fngBJXhwtIz8McCqhq0mNQbokTLGrzAp58E5b42cbWT1ST2bmpBcIUHgpUpCEX/P
-Vns0UYOzsyn6YB+8WfY0Tt1eZYBpkTnFh8O2VaySsx6Gv6qfHBhqdv5kdUvh3j0w
-sUudpxM63B6niIMJMtn4NQNsC7uvoU+f2YuobV8Bi0mmSGjJdpSUa5QF+MsKPB7u
-kaVmzc8E+CgyYDqf7o24n+rgmkf5FQC83d3hcUJFL0pe9pS5d56FY6CvarMqfD3W
-Jds66/LqIrm91PTjPSUvFp78fk17WRb91x6awePSrGiIPXkSGHvPZrZJihFMCZfc
-ymJ2m4sddIoydbTBIEioaYPBBKLqP+IPO/c4zs00P5/XbBkAdes=
-=t0QA
-----END PGP SIGNATURE-----
--- a/libvirt-7.0.0.tar.xz
+++ b/libvirt-7.0.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca3833844d08c22867f1d1a46edc36bda7d6fe1a4f267e7d77100b79fc9ddd89
+size 8567648
--- a/libvirt-7.0.0.tar.xz.asc
+++ b/libvirt-7.0.0.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmABWDMACgkQymi+gBAI
+TJw++g//bm0kEnJtFg5dtirTqDrOVoots/9QJsAyjOq7o/BeKlTzbIeGScRSfYIm
+iMDnRqtNSihunntklmP6uetzXBTJIqzyKAi/dMM2mVY7ueC4EK34WoQswPOQVMuc
+o4qU4zF0+pJexorKlBQce35gQsHy73mqUAOx+sf6ndGAHPNbZhJ6G60uqwrRfwRl
+OWbBqCKp3SJ34tMN2wd2bB7yBK2eD0oGbyAcQZ58kfcbJSSmqagfDQko6lCJcx9K
+QAbN3XdMyvUJL6o/Yqu9h7hs1k3QUjUqdXpVVwV1EGStZFylP3fmos5m/OM82tmY
+rmViyaDQU05eDrYtwy6pfabdgibOhIt/YUkxnY+ey1GZwSlUqdwxyEkfWGL5tn75
+41qyiltV3NLS/C8ZOTGla/ZGj4Q7fkXo6u0bLk8TPypsywHh1wRp8Azns+NDLgP3
+tMirz3Suqbrwgfs6mfD87Nw5C/MAJcdFshamKvX/j89Bas+rjeoFs37P2ggvcdWl
+HcFmhgAk2Me/LbkSbcSiaUreq1EUM4CzmAoHYVFmYSw9Ycb83/+WHm2uQnIyHGfM
+7U3F8cuBVKE/mj6bEVbBDHBf6Vx/EkQdS+J0rmGYZaIStlSatnZoI7dWOa1pqY3X
+Tqk8syK9KqmQaWM2Fa/OKkHBIxbf9hLgvewEI1vt+Vt/rIj/JHQ=
+=ROx5
+-----END PGP SIGNATURE-----
--- 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: <ro@suse.de>

-Index: libvirt-6.10.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-7.0.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-6.10.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-6.10.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-7.0.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-7.0.0/src/cpu_map/ppc64_POWER8.xml
@@ -4,5 +4,7 @@
     <pvr value='0x004b0000' mask='0xffff0000'/>
     <pvr value='0x004c0000' mask='0xffff0000'/>
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@ -1,7 +1,7 @@
-Index: libvirt-6.10.0/tools/virsh.c
+Index: libvirt-7.0.0/tools/virsh.c
 ===================================================================
--- libvirt-6.10.0.orig/tools/virsh.c
-+++ libvirt-6.10.0/tools/virsh.c
+--- libvirt-7.0.0.orig/tools/virsh.c
+++ libvirt-7.0.0/tools/virsh.c
@@ -543,6 +543,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
@ -11,10 +11,10 @@ Index: libvirt-6.10.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-6.10.0/src/interface/interface_backend_netcf.c
+Index: libvirt-7.0.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-6.10.0/src/interface/interface_backend_netcf.c
+--- libvirt-7.0.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-7.0.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -126,10 +126,10 @@ Index: libvirt-6.10.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-6.10.0/src/interface/interface_driver.c
+Index: libvirt-7.0.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/interface/interface_driver.c
-+++ libvirt-6.10.0/src/interface/interface_driver.c
+--- libvirt-7.0.0.orig/src/interface/interface_driver.c
+++ libvirt-7.0.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -147,10 +147,10 @@ Index: libvirt-6.10.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-6.10.0/meson.build
+Index: libvirt-7.0.0/meson.build
 ===================================================================
--- libvirt-6.10.0.orig/meson.build
-+++ libvirt-6.10.0/meson.build
+--- libvirt-7.0.0.orig/meson.build
+++ libvirt-7.0.0/meson.build
@@ -1159,6 +1159,12 @@ if netcf_dep.found()
   conf.set('WITH_NETCF', 1)
 endif
@ -164,7 +164,7 @@ Index: libvirt-6.10.0/meson.build
 have_gnu_gettext_tools = false
 if not get_option('nls').disabled()
   have_gettext = cc.has_function('gettext')
-@@ -1548,10 +1554,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1550,10 +1556,10 @@ elif get_option('driver_hyperv').enabled
   error('openwsman is required for the Hyper-V driver')
 endif
 
@ -177,7 +177,7 @@ Index: libvirt-6.10.0/meson.build
 endif
 
 if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2361,6 +2367,7 @@ libs_summary = {
+@@ -2363,6 +2369,7 @@ libs_summary = {
   'libssh2': libssh2_dep.found(),
   'libutil': libutil_dep.found(),
   'netcf': netcf_dep.found(),
@ -185,10 +185,10 @@ Index: libvirt-6.10.0/meson.build
   'NLS': have_gnu_gettext_tools,
   'numactl': numactl_dep.found(),
   'openwsman': openwsman_dep.found(),
-Index: libvirt-6.10.0/src/interface/meson.build
+Index: libvirt-7.0.0/src/interface/meson.build
 ===================================================================
--- libvirt-6.10.0.orig/src/interface/meson.build
-+++ libvirt-6.10.0/src/interface/meson.build
+--- libvirt-7.0.0.orig/src/interface/meson.build
+++ libvirt-7.0.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [
   'interface_driver.c',
 ]
@ -206,10 +206,10 @@ Index: libvirt-6.10.0/src/interface/meson.build
       udev_dep,
     ],
     'link_args': [
-Index: libvirt-6.10.0/meson_options.txt
+Index: libvirt-7.0.0/meson_options.txt
 ===================================================================
--- libvirt-6.10.0.orig/meson_options.txt
-+++ libvirt-6.10.0/meson_options.txt
+--- libvirt-7.0.0.orig/meson_options.txt
+++ libvirt-7.0.0/meson_options.txt
@@ -28,6 +28,7 @@ option('libpcap', type: 'feature', value
 option('libssh', type: 'feature', value: 'auto', description: 'libssh support')
 option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support')
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jan 19 02:12:11 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 7.0.0
+  - jsc#SLE-15860
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html
+  - Dropped patches:
+    0d05d51b-apparmor-lxc-fix.patch,
+    cf4e7e62-lxc-def-secmodel.patch,
+    0ddebdb4-qemu-snapshot-deletion.patch
+
 -------------------------------------------------------------------
 Mon Jan  4 19:19:19 UTC 2021 - olaf@aepfle.de

--- a/libvirt.spec
+++ b/libvirt.spec
@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -141,7 +141,7 @@

 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        6.10.0
+Version:        7.0.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -291,9 +291,6 @@ Source6:        libvirtd-relocation-server.xml
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
-Patch0:         0d05d51b-apparmor-lxc-fix.patch
-Patch1:         cf4e7e62-lxc-def-secmodel.patch
-Patch2:         0ddebdb4-qemu-snapshot-deletion.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -631,6 +628,10 @@ Requires:       lzop
 Requires:       qemu
 Requires:       systemd-container
 Requires:       xz
+# swtp is needed to manage <tpm> devices.
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
+Requires:       swtpm
+%endif

 %description daemon-driver-qemu
 The qemu driver plugin for the libvirtd daemon, providing
@ -1628,7 +1629,7 @@ fi
 %dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/swtpm/
 %dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/
 %dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/%{name}/
-%dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/%{name}/qemu/
+%dir %attr(0731, tss, tss) %{_localstatedir}/log/swtpm/%{name}/qemu/
 %{_bindir}/virt-qemu-run
 %{_mandir}/man1/virt-qemu-run.1*
 %endif
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -8,11 +8,11 @@ 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-6.10.0/src/libxl/libxl_driver.c
+Index: libvirt-7.0.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.10.0/src/libxl/libxl_driver.c
-@@ -1374,6 +1374,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-7.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.0.0/src/libxl/libxl_driver.c
+@@ -1372,6 +1372,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
 static int
@ -74,7 +74,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6669,6 +6724,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6664,6 +6719,7 @@ static virHypervisorDriver libxlHypervis
     .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
     .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
     .domainReboot = libxlDomainReboot, /* 0.9.0 */
--- 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-6.10.0/src/libxl/libxl_conf.c
+Index: libvirt-7.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.10.0/src/libxl/libxl_conf.c
+--- libvirt-7.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.0.0/src/libxl/libxl_conf.c
@@ -921,6 +921,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
@ -38,7 +38,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
                            const char *username,
-@@ -1158,6 +1182,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1159,6 +1183,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
--- a/libxl-set-migration-constraints.patch
+++ b/libxl-set-migration-constraints.patch
@ -16,11 +16,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 tools/virsh.pod                  |    8 ++++++++
 6 files changed, 125 insertions(+), 6 deletions(-)

-Index: libvirt-6.10.0/docs/manpages/virsh.rst
+Index: libvirt-7.0.0/docs/manpages/virsh.rst
 ===================================================================
--- libvirt-6.10.0.orig/docs/manpages/virsh.rst
-+++ libvirt-6.10.0/docs/manpages/virsh.rst
-@@ -3134,7 +3134,8 @@ migrate
+--- libvirt-7.0.0.orig/docs/manpages/virsh.rst
+++ libvirt-7.0.0/docs/manpages/virsh.rst
+@@ -3145,7 +3145,8 @@ migrate
       [--postcopy-bandwidth bandwidth]
       [--parallel [--parallel-connections connections]]
       [--bandwidth bandwidth] [--tls-destination hostname]
@ -30,7 +30,7 @@ Index: libvirt-6.10.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*
-@@ -3240,6 +3241,12 @@ parallel connections. The number of such
+@@ -3251,6 +3252,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-6.10.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-6.10.0/include/libvirt/libvirt-domain.h
+Index: libvirt-7.0.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-6.10.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-6.10.0/include/libvirt/libvirt-domain.h
+--- libvirt-7.0.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-7.0.0/include/libvirt/libvirt-domain.h
@@ -1078,6 +1078,25 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@ -73,11 +73,11 @@ Index: libvirt-6.10.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-6.10.0/src/libxl/libxl_driver.c
+Index: libvirt-7.0.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.10.0/src/libxl/libxl_driver.c
-@@ -6231,6 +6231,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-7.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.0.0/src/libxl/libxl_driver.c
+@@ -6226,6 +6226,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -87,7 +87,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -6247,6 +6250,15 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6242,6 +6245,15 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -103,7 +103,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -6261,11 +6273,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6256,11 +6268,11 @@ libxlDomainMigratePerform3Params(virDoma
 
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@ -117,10 +117,10 @@ Index: libvirt-6.10.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-6.10.0/src/libxl/libxl_migration.c
+Index: libvirt-7.0.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-6.10.0/src/libxl/libxl_migration.c
+--- libvirt-7.0.0.orig/src/libxl/libxl_migration.c
+++ libvirt-7.0.0/src/libxl/libxl_migration.c
@@ -341,18 +341,38 @@ libxlMigrateDstReceive(virNetSocketPtr s
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@ -253,8 +253,8 @@ Index: libvirt-6.10.0/src/libxl/libxl_migration.c
 +                                  const libxlDomainMigrationProps *props)
 {
     int ret = -1;
-     bool useParams;
-@@ -1178,7 +1198,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+     int useParams;
+@@ -1180,7 +1200,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
     }
 
     ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -263,7 +263,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_migration.c
 
     if (ret < 0) {
         /*
-@@ -1205,7 +1225,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1207,7 +1227,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-6.10.0/src/libxl/libxl_migration.c
 {
     libxlDomainObjPrivatePtr priv = vm->privateData;
     char *hostname = NULL;
-@@ -1241,7 +1261,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1243,7 +1263,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
 
     /* suspend vm and send saved data to dst through socket fd */
     virObjectUnlock(vm);
@ -281,10 +281,10 @@ Index: libvirt-6.10.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret == 0) {
-Index: libvirt-6.10.0/src/libxl/libxl_migration.h
+Index: libvirt-7.0.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-6.10.0/src/libxl/libxl_migration.h
+--- libvirt-7.0.0.orig/src/libxl/libxl_migration.h
+++ libvirt-7.0.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,10 +327,10 @@ Index: libvirt-6.10.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-6.10.0/tools/virsh-domain.c
+Index: libvirt-7.0.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-6.10.0.orig/tools/virsh-domain.c
-+++ libvirt-6.10.0/tools/virsh-domain.c
+--- libvirt-7.0.0.orig/tools/virsh-domain.c
+++ libvirt-7.0.0/tools/virsh-domain.c
@@ -10707,6 +10707,18 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_STRING,
      .help = N_("override the destination host name used for TLS verification")
--- 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-6.10.0/src/libxl/libxl_conf.c
+Index: libvirt-7.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.10.0/src/libxl/libxl_conf.c
+--- libvirt-7.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.0.0/src/libxl/libxl_conf.c
@@ -921,6 +921,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
@ -34,7 +34,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 static void
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
-@@ -1057,6 +1073,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -1058,6 +1074,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
 int
 libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
 {
@ -42,7 +42,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_conf.c
     const char *driver = virDomainDiskGetDriver(l_disk);
     int format = virDomainDiskGetFormat(l_disk);
     int actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -1072,7 +1089,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1073,7 +1090,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
         if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
             return -1;
     } else {
@ -51,7 +51,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_conf.c
     }
 
     x_disk->vdev = g_strdup(l_disk->dst);
-@@ -1183,6 +1200,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1184,6 +1201,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
     libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
--- 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-6.10.0/src/lxc/lxc_controller.c
+Index: libvirt-7.0.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-6.10.0/src/lxc/lxc_controller.c
+--- libvirt-7.0.0.orig/src/lxc/lxc_controller.c
+++ libvirt-7.0.0/src/lxc/lxc_controller.c
@@ -2015,6 +2015,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
@ -25,11 +25,11 @@ Index: libvirt-6.10.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-6.10.0/src/lxc/lxc_driver.c
+Index: libvirt-7.0.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.10.0/src/lxc/lxc_driver.c
-@@ -66,6 +66,7 @@
+--- libvirt-7.0.0.orig/src/lxc/lxc_driver.c
+++ libvirt-7.0.0/src/lxc/lxc_driver.c
+@@ -67,6 +67,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
 #include "viruri.h"
@ -37,7 +37,7 @@ Index: libvirt-6.10.0/src/lxc/lxc_driver.c
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "viraccessapichecklxc.h"
-@@ -3549,6 +3550,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
+@@ -3545,6 +3546,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
         case VIR_DOMAIN_NET_TYPE_NETWORK:
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             ignore_value(virNetDevVethDelete(veth));
@ -45,7 +45,7 @@ Index: libvirt-6.10.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -3988,6 +3990,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -3984,6 +3986,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -53,11 +53,11 @@ Index: libvirt-6.10.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-6.10.0/src/lxc/lxc_process.c
+Index: libvirt-7.0.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-6.10.0.orig/src/lxc/lxc_process.c
-+++ libvirt-6.10.0/src/lxc/lxc_process.c
-@@ -50,6 +50,7 @@
+--- libvirt-7.0.0.orig/src/lxc/lxc_process.c
+++ libvirt-7.0.0/src/lxc/lxc_process.c
+@@ -51,6 +51,7 @@
 #include "virstring.h"
 #include "virprocess.h"
 #include "virsystemd.h"
@ -65,7 +65,7 @@ Index: libvirt-6.10.0/src/lxc/lxc_process.c
 #include "netdev_bandwidth_conf.h"
 #include "virutil.h"
 
-@@ -231,6 +232,7 @@ static void virLXCProcessCleanup(virLXCD
+@@ -250,6 +251,7 @@ static void virLXCProcessCleanup(virLXCD
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname));
         }
     }
--- 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 <mwilck@suse.com>
 tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

-Index: libvirt-6.10.0/src/network/bridge_driver.c
+Index: libvirt-7.0.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-6.10.0.orig/src/network/bridge_driver.c
-+++ libvirt-6.10.0/src/network/bridge_driver.c
-@@ -1447,7 +1447,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-7.0.0.orig/src/network/bridge_driver.c
+++ libvirt-7.0.0/src/network/bridge_driver.c
+@@ -1449,7 +1449,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-6.10.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-6.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-7.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-6.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-6.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-7.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-7.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -10,7 +10,6 @@ bind-dynamic
 interface=virbr1
 dhcp-range=192.168.122.1,static
--- 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-6.10.0/src/util/virarch.c
+Index: libvirt-7.0.0/src/util/virarch.c
 ===================================================================
--- libvirt-6.10.0.orig/src/util/virarch.c
-+++ libvirt-6.10.0/src/util/virarch.c
+--- libvirt-7.0.0.orig/src/util/virarch.c
+++ libvirt-7.0.0/src/util/virarch.c
@@ -220,6 +220,8 @@ virArch virArchFromHost(void)
         arch = VIR_ARCH_I686;
     } else if (STREQ(ut.machine, "amd64")) {
--- a/qemu-apparmor-screenshot.patch
+++ b/qemu-apparmor-screenshot.patch
@ -1,7 +1,7 @@
-Index: libvirt-6.10.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-7.0.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-6.10.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.10.0/src/security/apparmor/libvirt-qemu
+--- libvirt-7.0.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-7.0.0/src/security/apparmor/libvirt-qemu
@@ -244,3 +244,6 @@
   # /sys/bus/nd/devices
   / r, # harmless on any lsb compliant system
--- a/suse-apparmor-libnl-paths.patch
+++ b/suse-apparmor-libnl-paths.patch
@ -8,10 +8,10 @@ It was also noticed that the per-domain profiles need a libnl rule
 to squelch a denial when starting confined domains.

 Found while investigating bsc#1058847
-Index: libvirt-6.10.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-7.0.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-6.10.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.10.0/src/security/apparmor/libvirt-qemu
+--- libvirt-7.0.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-7.0.0/src/security/apparmor/libvirt-qemu
@@ -64,6 +64,7 @@
   #/dev/fb* rw,
 
@ -20,10 +20,10 @@ Index: libvirt-6.10.0/src/security/apparmor/libvirt-qemu
   @{HOME}/.pulse-cookie rwk,
   owner /root/.pulse-cookie rwk,
   owner /root/.pulse/ rw,
-Index: libvirt-6.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-7.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 ===================================================================
--- libvirt-6.10.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ libvirt-6.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+--- libvirt-7.0.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-7.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt
   # Used when internally running another command (namely apparmor_parser)
   @{PROC}/@{pid}/fd/ r,
--- a/suse-bump-xen-version.patch
+++ b/suse-bump-xen-version.patch
@ -9,11 +9,11 @@ need backporting to anything older. The dependency on xen.git commit
 c3999835df makes it hard to upstream this patch.

 See bsc#1157490 and bsc#1167007 for more details
-Index: libvirt-6.10.0/src/libxl/libxl_conf.c
+Index: libvirt-7.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.10.0/src/libxl/libxl_conf.c
-@@ -1826,7 +1826,7 @@ libxlDriverConfigNew(void)
+--- libvirt-7.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.0.0/src/libxl/libxl_conf.c
+@@ -1827,7 +1827,7 @@ libxlDriverConfigNew(void)
 int
 libxlDriverConfigInit(libxlDriverConfigPtr cfg)
 {
@ -22,11 +22,11 @@ Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 
     if (virFileMakePath(cfg->logDir) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-Index: libvirt-6.10.0/src/libxl/libxl_domain.c
+Index: libvirt-7.0.0/src/libxl/libxl_domain.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_domain.c
-+++ libvirt-6.10.0/src/libxl/libxl_domain.c
-@@ -1012,8 +1012,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
+--- libvirt-7.0.0.orig/src/libxl/libxl_domain.c
+++ libvirt-7.0.0/src/libxl/libxl_domain.c
+@@ -1013,8 +1013,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
 static int
 libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config)
 {
@ -37,7 +37,7 @@ Index: libvirt-6.10.0/src/libxl/libxl_domain.c
     int32_t target_mem;
     int tries = 3;
     int wait_secs = 10;
-@@ -1407,7 +1407,7 @@ libxlDomainStart(libxlDriverPrivatePtr d
+@@ -1404,7 +1404,7 @@ libxlDomainStart(libxlDriverPrivatePtr d
         params.stream_version = restore_ver;
 #endif
         ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
@ -46,10 +46,10 @@ Index: libvirt-6.10.0/src/libxl/libxl_domain.c
                                           &aop_console_how);
         libxl_domain_restore_params_dispose(&params);
     }
-Index: libvirt-6.10.0/tests/libxlmock.c
+Index: libvirt-7.0.0/tests/libxlmock.c
 ===================================================================
--- libvirt-6.10.0.orig/tests/libxlmock.c
-+++ libvirt-6.10.0/tests/libxlmock.c
+--- libvirt-7.0.0.orig/tests/libxlmock.c
+++ libvirt-7.0.0/tests/libxlmock.c
@@ -67,7 +67,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version
 VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
                        int, 0,
@ -59,11 +59,11 @@ Index: libvirt-6.10.0/tests/libxlmock.c
 
 VIR_MOCK_STUB_RET_ARGS(xc_interface_close,
                        int, 0,
-Index: libvirt-6.10.0/meson.build
+Index: libvirt-7.0.0/meson.build
 ===================================================================
--- libvirt-6.10.0.orig/meson.build
-+++ libvirt-6.10.0/meson.build
-@@ -1561,7 +1561,7 @@ elif get_option('driver_interface').enab
+--- libvirt-7.0.0.orig/meson.build
+++ libvirt-7.0.0/meson.build
+@@ -1563,7 +1563,7 @@ elif get_option('driver_interface').enab
 endif
 
 if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
@ -72,7 +72,7 @@ Index: libvirt-6.10.0/meson.build
   libxl_dep = dependency('xenlight', version: '>=' + libxl_version, required: get_option('driver_libxl'))
 
   if libxl_dep.found()
-@@ -1591,7 +1591,7 @@ if not get_option('driver_libxl').disabl
+@@ -1593,7 +1593,7 @@ if not get_option('driver_libxl').disabl
     endif
 
     libxl_dep = declare_dependency(
--- 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-6.10.0/tools/libvirt-guests.sh.in
+Index: libvirt-7.0.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-6.10.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-6.10.0/tools/libvirt-guests.sh.in
+--- libvirt-7.0.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-7.0.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
@ -163,10 +163,10 @@ Index: libvirt-6.10.0/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-6.10.0/tools/libvirt-guests.sysconf
+Index: libvirt-7.0.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-6.10.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-6.10.0/tools/libvirt-guests.sysconf
+--- libvirt-7.0.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-7.0.0/tools/libvirt-guests.sysconf
@@ -1,9 +1,14 @@
 +## Path: System/Virtualization/libvirt-guests
 # Customizations for the libvirt-guests.service systemd unit
@ -214,7 +214,7 @@ Index: libvirt-6.10.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
-@@ -39,14 +52,18 @@
+@@ -39,11 +52,15 @@
 # request). The default value is 300 seconds (5 minutes).
 #SHUTDOWN_TIMEOUT=300
 
@ -229,8 +229,4 @@ Index: libvirt-6.10.0/tools/libvirt-guests.sysconf
 +## Default: 0
 # If non-zero, try to sync guest time on domain resume. Be aware, that
 # this requires guest agent with support for time synchronization
- # running in the guest. For instance, qemu-ga doesn't support guest time
- # synchronization on Windows guests, but Linux ones. By default, this
- # functionality is turned off.
-#SYNC_TIME=1
-+SYNC_TIME=0
+ # running in the guest. By default, this functionality is turned off.
--- 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-6.10.0/src/remote/remote_daemon_config.c
+Index: libvirt-7.0.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-6.10.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-6.10.0/src/remote/remote_daemon_config.c
+--- libvirt-7.0.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-7.0.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-6.10.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-6.10.0/src/remote/libvirtd.conf.in
+Index: libvirt-7.0.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-6.10.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-6.10.0/src/remote/libvirtd.conf.in
+--- libvirt-7.0.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-7.0.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-6.10.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-6.10.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-7.0.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-6.10.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-6.10.0/src/remote/test_libvirtd.aug.in
+--- libvirt-7.0.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-7.0.0/src/remote/test_libvirtd.aug.in
@@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
 
    test @DAEMON_NAME_UC@.lns get conf =
--- 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-6.10.0/src/remote/libvirtd.sysconf
+Index: libvirt-7.0.0/src/remote/libvirtd.sysconf
 ===================================================================
--- libvirt-6.10.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-6.10.0/src/remote/libvirtd.sysconf
+--- libvirt-7.0.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-7.0.0/src/remote/libvirtd.sysconf
@@ -1,5 +1,9 @@
 +## Path: System/Virtualization/libvirt
 # Customizations for the libvirtd.service systemd unit
--- 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-6.10.0/src/libxl/libxl.conf
+Index: libvirt-7.0.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl.conf
-+++ libvirt-6.10.0/src/libxl/libxl.conf
+--- libvirt-7.0.0.orig/src/libxl/libxl.conf
+++ libvirt-7.0.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -27,11 +27,11 @@ Index: libvirt-6.10.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-6.10.0/src/libxl/libxl_conf.c
+Index: libvirt-7.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.10.0/src/libxl/libxl_conf.c
-@@ -1743,15 +1743,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
+--- libvirt-7.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.0.0/src/libxl/libxl_conf.c
+@@ -1744,15 +1744,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-6.10.0/src/libxl/libxl_conf.c
     int res;
 
     res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
-@@ -1760,15 +1757,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
+@@ -1761,15 +1758,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
     else if (res == 1)
         return 0;
 
@ -66,10 +66,10 @@ Index: libvirt-6.10.0/src/libxl/libxl_conf.c
     return 0;
 }
 
-Index: libvirt-6.10.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-7.0.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-6.10.0/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-7.0.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-7.0.0/src/libxl/test_libvirtd_libxl.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
   @CONFIG@
 
--- a/suse-ovmf-paths.patch
+++ b/suse-ovmf-paths.patch
@ -1,9 +1,9 @@
 Adjust paths of OVMF firmwares on SUSE distros

-Index: libvirt-6.10.0/src/qemu/qemu.conf
+Index: libvirt-7.0.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-6.10.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.10.0/src/qemu/qemu.conf
+--- libvirt-7.0.0.orig/src/qemu/qemu.conf
+++ libvirt-7.0.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.
@ -18,10 +18,10 @@ Index: libvirt-6.10.0/src/qemu/qemu.conf
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-6.10.0/src/qemu/qemu_conf.c
+Index: libvirt-7.0.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.10.0/src/qemu/qemu_conf.c
+--- libvirt-7.0.0.orig/src/qemu/qemu_conf.c
+++ libvirt-7.0.0/src/qemu/qemu_conf.c
@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -36,10 +36,10 @@ Index: libvirt-6.10.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-6.10.0/src/security/virt-aa-helper.c
+Index: libvirt-7.0.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-6.10.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-6.10.0/src/security/virt-aa-helper.c
+--- libvirt-7.0.0.orig/src/security/virt-aa-helper.c
+++ libvirt-7.0.0/src/security/virt-aa-helper.c
@@ -479,7 +479,8 @@ valid_path(const char *path, const bool
         "/usr/share/ovmf/",              /* for OVMF images */
         "/usr/share/AAVMF/",             /* for AAVMF images */
@ -50,10 +50,10 @@ Index: libvirt-6.10.0/src/security/virt-aa-helper.c
     };
     /* override the above with these */
     const char * const override[] = {
-Index: libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.0.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-7.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-7.0.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
 { "migration_port_max" = "49215" }
 { "log_timestamp" = "0" }
--- 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-6.10.0/src/qemu/qemu.conf
+Index: libvirt-7.0.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-6.10.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.10.0/src/qemu/qemu.conf
+--- libvirt-7.0.0.orig/src/qemu/qemu.conf
+++ libvirt-7.0.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-6.10.0/src/qemu/qemu.conf
 #
 #lock_manager = "lockd"
 
-Index: libvirt-6.10.0/src/qemu/qemu_conf.c
+Index: libvirt-7.0.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.10.0/src/qemu/qemu_conf.c
+--- libvirt-7.0.0.orig/src/qemu/qemu_conf.c
+++ libvirt-7.0.0/src/qemu/qemu_conf.c
@@ -272,7 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
     cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
     cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
@ -73,10 +73,10 @@ Index: libvirt-6.10.0/src/qemu/qemu_conf.c
     cfg->securityRequireConfined = false;
 
     cfg->keepAliveInterval = 5;
-Index: libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.0.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-7.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-7.0.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" }
--- 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-6.10.0/src/locking/virtlockd.sysconf
+Index: libvirt-7.0.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-6.10.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-6.10.0/src/locking/virtlockd.sysconf
+--- libvirt-7.0.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-7.0.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +
--- 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-6.10.0/src/logging/virtlogd.sysconf
+Index: libvirt-7.0.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-6.10.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-6.10.0/src/logging/virtlogd.sysconf
+--- libvirt-7.0.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-7.0.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +
--- a/suse-xen-ovmf-loaders.patch
+++ b/suse-xen-ovmf-loaders.patch
@ -5,11 +5,11 @@ upstream support for firmware autoselection in the xen driver. Sadly, the
 upstream efforts to improve firmware handling in the qemu driver broke
 the firmware handling in the xen driver.

-Index: libvirt-6.10.0/src/libxl/libxl_conf.c
+Index: libvirt-7.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.10.0/src/libxl/libxl_conf.c
-@@ -1783,6 +1783,15 @@ libxlDriverConfigNew(void)
+--- libvirt-7.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.0.0/src/libxl/libxl_conf.c
+@@ -1784,6 +1784,15 @@ libxlDriverConfigNew(void)
     cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR);
     cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR);
 
--- a/virt-create-rootfs.patch
+++ b/virt-create-rootfs.patch
@ -1,7 +1,7 @@
-Index: libvirt-6.10.0/tools/virt-create-rootfs
+Index: libvirt-7.0.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-6.10.0/tools/virt-create-rootfs
+++ libvirt-7.0.0/tools/virt-create-rootfs
@@ -0,0 +1,231 @@
 +#!/bin/sh
 +set -e
@ -234,10 +234,10 @@ Index: libvirt-6.10.0/tools/virt-create-rootfs
 +    echo "pts/0" >> "$ROOT/etc/securetty"
 +    chroot "$ROOT" /usr/bin/passwd
 +fi
-Index: libvirt-6.10.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-7.0.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-6.10.0/docs/manpages/virt-create-rootfs.rst
+++ libvirt-7.0.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@ -327,10 +327,10 @@ Index: libvirt-6.10.0/docs/manpages/virt-create-rootfs.rst
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-6.10.0/docs/manpages/meson.build
+Index: libvirt-7.0.0/docs/manpages/meson.build
 ===================================================================
--- libvirt-6.10.0.orig/docs/manpages/meson.build
-+++ libvirt-6.10.0/docs/manpages/meson.build
+--- libvirt-7.0.0.orig/docs/manpages/meson.build
+++ libvirt-7.0.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-6.10.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-6.10.0/tools/meson.build
+Index: libvirt-7.0.0/tools/meson.build
 ===================================================================
--- libvirt-6.10.0.orig/tools/meson.build
-+++ libvirt-6.10.0/tools/meson.build
+--- libvirt-7.0.0.orig/tools/meson.build
+++ libvirt-7.0.0/tools/meson.build
@@ -149,6 +149,8 @@ else
   virsh_icon_res = []
 endif