diff --git a/0001-Extract-stats-functions-from-the-qemu-driver.patch b/0001-Extract-stats-functions-from-the-qemu-driver.patch
index c5475bf..438c20a 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.5.0/src/conf/domain_stats.c
+Index: libvirt-7.6.0/src/conf/domain_stats.c
===================================================================
--- /dev/null
-+++ libvirt-7.5.0/src/conf/domain_stats.c
++++ libvirt-7.6.0/src/conf/domain_stats.c
@@ -0,0 +1,117 @@
+/*
+ * domain_stats.c: domain stats extraction helpers
@@ -140,10 +140,10 @@ Index: libvirt-7.5.0/src/conf/domain_stats.c
+}
+
+#undef STATS_ADD_NET_PARAM
-Index: libvirt-7.5.0/src/conf/domain_stats.h
+Index: libvirt-7.6.0/src/conf/domain_stats.h
===================================================================
--- /dev/null
-+++ libvirt-7.5.0/src/conf/domain_stats.h
++++ libvirt-7.6.0/src/conf/domain_stats.h
@@ -0,0 +1,60 @@
+/*
+ * domain_stats.h: domain stats extraction helpers
@@ -205,11 +205,11 @@ Index: libvirt-7.5.0/src/conf/domain_stats.h
+ virTypedParamList *params);
+
+#endif /* __DOMAIN_STATS_H */
-Index: libvirt-7.5.0/src/libvirt_private.syms
+Index: libvirt-7.6.0/src/libvirt_private.syms
===================================================================
---- libvirt-7.5.0.orig/src/libvirt_private.syms
-+++ libvirt-7.5.0/src/libvirt_private.syms
-@@ -756,12 +756,16 @@ virDomainConfNWFilterTeardown;
+--- libvirt-7.6.0.orig/src/libvirt_private.syms
++++ libvirt-7.6.0/src/libvirt_private.syms
+@@ -761,12 +761,16 @@ virDomainConfNWFilterTeardown;
virDomainConfVMNWFilterTeardown;
@@ -227,7 +227,7 @@ Index: libvirt-7.5.0/src/libvirt_private.syms
# conf/interface_conf.h
virInterfaceDefFormat;
virInterfaceDefFree;
-@@ -1921,6 +1925,7 @@ virCgroupGetMemoryUsage;
+@@ -1926,6 +1930,7 @@ virCgroupGetMemoryUsage;
virCgroupGetMemSwapHardLimit;
virCgroupGetMemSwapUsage;
virCgroupGetPercpuStats;
@@ -235,10 +235,10 @@ Index: libvirt-7.5.0/src/libvirt_private.syms
virCgroupHasController;
virCgroupHasEmptyTasks;
virCgroupKillPainfully;
-Index: libvirt-7.5.0/src/qemu/qemu_driver.c
+Index: libvirt-7.6.0/src/qemu/qemu_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-7.5.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 @@
#include "virarptable.h"
#include "viruuid.h"
@@ -247,7 +247,7 @@ Index: libvirt-7.5.0/src/qemu/qemu_driver.c
#include "domain_audit.h"
#include "domain_cgroup.h"
#include "domain_driver.h"
-@@ -17519,13 +17520,7 @@ qemuDomainGetStatsState(virQEMUDriver *d
+@@ -17537,13 +17538,7 @@ qemuDomainGetStatsState(virQEMUDriver *d
virTypedParamList *params,
unsigned int privflags G_GNUC_UNUSED)
{
@@ -262,7 +262,7 @@ Index: libvirt-7.5.0/src/qemu/qemu_driver.c
}
-@@ -17818,25 +17813,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -17836,25 +17831,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
virTypedParamList *params)
{
qemuDomainObjPrivate *priv = dom->privateData;
@@ -288,8 +288,8 @@ Index: libvirt-7.5.0/src/qemu/qemu_driver.c
+ return virCgroupGetStatsCpu(priv->cgroup, params);
}
-
-@@ -18009,76 +17990,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr
+ static int
+@@ -18047,76 +18028,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr
return ret;
}
@@ -367,11 +367,11 @@ Index: libvirt-7.5.0/src/qemu/qemu_driver.c
/* refresh information by opening images on the disk */
static int
-Index: libvirt-7.5.0/src/util/vircgroup.c
+Index: libvirt-7.6.0/src/util/vircgroup.c
===================================================================
---- libvirt-7.5.0.orig/src/util/vircgroup.c
-+++ libvirt-7.5.0/src/util/vircgroup.c
-@@ -3002,6 +3002,31 @@ virCgroupControllerAvailable(int control
+--- 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);
}
@@ -403,7 +403,7 @@ Index: libvirt-7.5.0/src/util/vircgroup.c
#else /* !__linux__ */
bool
-@@ -3011,6 +3036,14 @@ virCgroupAvailable(void)
+@@ -3014,6 +3039,14 @@ virCgroupAvailable(void)
}
@@ -418,10 +418,10 @@ Index: libvirt-7.5.0/src/util/vircgroup.c
int
virCgroupNewPartition(const char *path G_GNUC_UNUSED,
bool create G_GNUC_UNUSED,
-Index: libvirt-7.5.0/src/util/vircgroup.h
+Index: libvirt-7.6.0/src/util/vircgroup.h
===================================================================
---- libvirt-7.5.0.orig/src/util/vircgroup.h
-+++ libvirt-7.5.0/src/util/vircgroup.h
+--- libvirt-7.6.0.orig/src/util/vircgroup.h
++++ libvirt-7.6.0/src/util/vircgroup.h
@@ -23,6 +23,7 @@
#include "virbitmap.h"
@@ -437,10 +437,10 @@ Index: libvirt-7.5.0/src/util/vircgroup.h
+
+int virCgroupGetStatsCpu(virCgroup *cgroup,
+ virTypedParamList *params);
-Index: libvirt-7.5.0/src/conf/meson.build
+Index: libvirt-7.6.0/src/conf/meson.build
===================================================================
---- libvirt-7.5.0.orig/src/conf/meson.build
-+++ libvirt-7.5.0/src/conf/meson.build
+--- libvirt-7.6.0.orig/src/conf/meson.build
++++ libvirt-7.6.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 87dc8d4..c37d2f5 100644
--- 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-7.5.0/src/libxl/libxl_driver.c
+Index: libvirt-7.6.0/src/libxl/libxl_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.5.0/src/libxl/libxl_driver.c
-@@ -5285,6 +5285,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-7.6.0.orig/src/libxl/libxl_driver.c
++++ libvirt-7.6.0/src/libxl/libxl_driver.c
+@@ -5269,6 +5269,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
#undef LIBXL_SET_MEMSTAT
@@ -119,7 +119,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_driver.c
static int
libxlDomainGetJobInfo(virDomainPtr dom,
virDomainJobInfoPtr info)
-@@ -6583,6 +6672,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6567,6 +6656,7 @@ static virHypervisorDriver libxlHypervis
.domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */
.nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
.nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
@@ -127,10 +127,10 @@ Index: libvirt-7.5.0/src/libxl/libxl_driver.c
.domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */
.domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */
.domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */
-Index: libvirt-7.5.0/src/libxl/libxl_api_wrapper.h
+Index: libvirt-7.6.0/src/libxl/libxl_api_wrapper.h
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_api_wrapper.h
-+++ libvirt-7.5.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
@@ -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 f8fec96..696fb8a 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.5.0/src/lxc/lxc_driver.c
+Index: libvirt-7.6.0/src/lxc/lxc_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-7.5.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
@@ -74,6 +74,8 @@
#include "netdev_bandwidth_conf.h"
#include "virsocket.h"
diff --git a/_services b/_services
new file mode 100644
index 0000000..67b4406
--- /dev/null
+++ b/_services
@@ -0,0 +1,7 @@
+
+
+ disable
+ disable
+
+
\ No newline at end of file
diff --git a/de1e0ae0-lockd-no-error-if-lockspace.patch b/de1e0ae0-lockd-no-error-if-lockspace.patch
deleted file mode 100644
index d629970..0000000
--- a/de1e0ae0-lockd-no-error-if-lockspace.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit de1e0ae0e3119e9bfd0c21e8502e64c076009861
-Author: Jim Fehlig
-Date: Wed Jun 30 16:36:42 2021 -0600
-
- virtlockd: Don't report error if lockspace exists
-
- When the qemu or libxl driver is configured to use lockd and
- file_lockspace_dir is set, virtlockd emits an error when libvirtd
- is retarted
-
- May 25 15:44:31 virt81 virtlockd[7723]: Requested operation is not
- valid: Lockspace for path /data/libvirtd/lockspace already exists
-
- There is really no need to fail when the lockspace already exists,
- paricularly since the user is expected to create the lockspace
- specified in file_lockspace_dir. Failure to do so will prevent
- starting any domains
-
- virsh start test
- error: Failed to start domain 'test'
- error: Unable to open/create resource /data/libvirtd/lockspace/de22c4bf931e7c48b49e8ca64b477d44e78a51543e534df488b05ccd08ec5caa: No such file or directory
-
- Also, virLockManagerLockDaemonSetupLockspace already has logic to ignore
- the error. Since callers are not interested in the error, change
- virtlockd to not report or return an error when the specified lockspace
- already exists.
-
- Signed-off-by: Jim Fehlig
- Reviewed-by: Daniel Henrique Barboza
-
-Index: libvirt-7.5.0/src/locking/lock_daemon_dispatch.c
-===================================================================
---- libvirt-7.5.0.orig/src/locking/lock_daemon_dispatch.c
-+++ libvirt-7.5.0/src/locking/lock_daemon_dispatch.c
-@@ -405,9 +405,8 @@ virLockSpaceProtocolDispatchCreateLockSp
- }
-
- if (virLockDaemonFindLockSpace(lockDaemon, args->path) != NULL) {
-- virReportError(VIR_ERR_OPERATION_INVALID,
-- _("Lockspace for path %s already exists"),
-- args->path);
-+ VIR_DEBUG("Lockspace for path %s already exists", args->path);
-+ rv = 0;
- goto cleanup;
- }
-
-Index: libvirt-7.5.0/src/locking/lock_driver_lockd.c
-===================================================================
---- libvirt-7.5.0.orig/src/locking/lock_driver_lockd.c
-+++ libvirt-7.5.0/src/locking/lock_driver_lockd.c
-@@ -281,15 +281,8 @@ static int virLockManagerLockDaemonSetup
- VIR_LOCK_SPACE_PROTOCOL_PROC_CREATE_LOCKSPACE,
- 0, NULL, NULL, NULL,
- (xdrproc_t)xdr_virLockSpaceProtocolCreateLockSpaceArgs, (char*)&args,
-- (xdrproc_t)xdr_void, NULL) < 0) {
-- if (virGetLastErrorCode() == VIR_ERR_OPERATION_INVALID) {
-- /* The lockspace already exists */
-- virResetLastError();
-- rv = 0;
-- } else {
-- goto cleanup;
-- }
-- }
-+ (xdrproc_t)xdr_void, NULL) < 0)
-+ goto cleanup;
-
- rv = 0;
-
diff --git a/f58349c9-qemu-storage-migration.patch b/f58349c9-qemu-storage-migration.patch
deleted file mode 100644
index 56de763..0000000
--- a/f58349c9-qemu-storage-migration.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit f58349c9c6d26d98e7c8c195b1160d0c0cfff080
-Author: Peter Krempa
-Date: Fri Jul 2 14:17:57 2021 +0200
-
- qemu: migration: Use correct flag constant for enabling storage migration
-
- The 'storageMigration' flag is supposed to be true if storage migration
- is requested, which is based on VIR_MIGRATE_NON_SHARED_DISK or
- VIR_MIGRATE_NON_SHARED_INC flags. The assignment to the variable used
- QEMU_MONITOR_MIGRATE_NON_SHARED_INC (0x04) instead of
- VIR_MIGRATE_NON_SHARED_INC (0x80), caused libvirtd to skip the actual
- copy of data.
-
- Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1978526
- Fixes: da69f4b2084bff140238e450e264d6036ebef898
- Signed-off-by: Peter Krempa
- Reviewed-by: Ján Tomko
-
-Index: libvirt-7.5.0/src/qemu/qemu_migration.c
-===================================================================
---- libvirt-7.5.0.orig/src/qemu/qemu_migration.c
-+++ libvirt-7.5.0/src/qemu/qemu_migration.c
-@@ -4016,7 +4016,7 @@ qemuMigrationSrcRun(virQEMUDriver *drive
- bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
- bool events = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT);
- bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
-- bool storageMigration = flags & (VIR_MIGRATE_NON_SHARED_DISK | QEMU_MONITOR_MIGRATE_NON_SHARED_INC);
-+ bool storageMigration = flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC);
- bool cancel = false;
- unsigned int waitFlags;
- g_autoptr(virDomainDef) persistDef = NULL;
diff --git a/libvirt-7.5.0.tar.xz b/libvirt-7.5.0.tar.xz
deleted file mode 100644
index 348a219..0000000
--- a/libvirt-7.5.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
-size 8642788
diff --git a/libvirt-7.5.0.tar.xz.asc b/libvirt-7.5.0.tar.xz.asc
deleted file mode 100644
index 00d2ef1..0000000
--- a/libvirt-7.5.0.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmDdxtgACgkQymi+gBAI
-TJzOTw/+N2vQS7wRNPGh2t62TsjGIFAWGsWjJNFZdm9atydJRFJ/6HeC7dVhjwAJ
-RUFWomC7gQ4OqXeTWJc9dcQ9khAOha45r0mRUsto6gi1XiMDiytjkC8YKkpj6NRV
-Q4FLDJaaN7V67hXq7Iw1J0APG/DBRrO+mggJuI5ujYLgA8mIjGu4826sXf34Epem
-GBeMkBtX/KFv9FAet6Bl6wUpBdrpP4gvAjKSTnHgJ7+dlWuZKb+ZBUTy8/eoR2TE
-Q9vxt6TZe2VRhAKiYkqtVS15iVWlfnYKcjLUAQPQi6hh/Hr3JwMOu8Jyy9bTIyOF
-8bwdxTKX+Palb7ImCeQSYCdGV+ZyljDo89LeVS8OYHkS/qsNp4/LKU9B7zdHdUhB
-qgso8qqfqq+hK2u6gKSFlvHbCD5vnOD8GgHVX0gWYqGjq0GAcapKtsv7cOH+C+xr
-c+rmXvTO78JmMFvCcOpduwKtO/MNWSPYft4eCdePqZU6eC7/5mkcOJmPiiYowgZR
-w+jwt2yKYi6EWVTgBSRDpuVDG6/VTb1hv/DFgcgxpBQTVM+GQSg2Og+JgCivNYuJ
-yKgDzVY8ubMnfwTy8tBvpuAl8oAWroOvCX2k/YEolwipHs9VW01rB2mDoWD1/Yd7
-ubSuXymL8CZJQqZI7PWH9XBZbFeHz/vpCC/YhO9NkxfGkMLTPHM=
-=N7Ov
------END PGP SIGNATURE-----
diff --git a/libvirt-7.6.0.tar.xz b/libvirt-7.6.0.tar.xz
new file mode 100644
index 0000000..6ac0bf8
--- /dev/null
+++ b/libvirt-7.6.0.tar.xz
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..c761d61
--- /dev/null
+++ b/libvirt-7.6.0.tar.xz.asc
@@ -0,0 +1,16 @@
+-----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-power8-models.patch b/libvirt-power8-models.patch
index 46ebe90..f8be368 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.5.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-7.6.0/src/cpu_map/ppc64_POWER8.xml
===================================================================
---- libvirt-7.5.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-7.5.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
@@ -4,5 +4,7 @@
diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch
index 4849674..75d6225 100644
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@@ -1,7 +1,7 @@
-Index: libvirt-7.5.0/tools/virsh.c
+Index: libvirt-7.6.0/tools/virsh.c
===================================================================
---- libvirt-7.5.0.orig/tools/virsh.c
-+++ libvirt-7.5.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_
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
@@ -11,10 +11,10 @@ Index: libvirt-7.5.0/tools/virsh.c
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
-Index: libvirt-7.5.0/src/interface/interface_backend_netcf.c
+Index: libvirt-7.6.0/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-7.5.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-7.5.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
@@ -21,7 +21,12 @@
#include
@@ -126,10 +126,10 @@ Index: libvirt-7.5.0/src/interface/interface_backend_netcf.c
if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
return -1;
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-7.5.0/src/interface/interface_driver.c
+Index: libvirt-7.6.0/src/interface/interface_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/interface/interface_driver.c
-+++ libvirt-7.5.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
@@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0)
return 0;
@@ -147,11 +147,11 @@ Index: libvirt-7.5.0/src/interface/interface_driver.c
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
-Index: libvirt-7.5.0/meson.build
+Index: libvirt-7.6.0/meson.build
===================================================================
---- libvirt-7.5.0.orig/meson.build
-+++ libvirt-7.5.0/meson.build
-@@ -1052,6 +1052,12 @@ else
+--- libvirt-7.6.0.orig/meson.build
++++ libvirt-7.6.0/meson.build
+@@ -1088,6 +1088,12 @@ else
netcf_dep = dependency('', required: false)
endif
@@ -164,7 +164,7 @@ Index: libvirt-7.5.0/meson.build
have_gnu_gettext_tools = false
if not get_option('nls').disabled()
have_gettext = cc.has_function('gettext')
-@@ -1476,10 +1482,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1484,10 +1490,10 @@ elif get_option('driver_hyperv').enabled
error('openwsman is required for the Hyper-V driver')
endif
@@ -177,7 +177,7 @@ Index: libvirt-7.5.0/meson.build
endif
if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2325,6 +2331,7 @@ libs_summary = {
+@@ -2333,6 +2339,7 @@ libs_summary = {
'libssh2': libssh2_dep.found(),
'libutil': libutil_dep.found(),
'netcf': conf.has('WITH_NETCF'),
@@ -185,10 +185,10 @@ Index: libvirt-7.5.0/meson.build
'NLS': have_gnu_gettext_tools,
'numactl': numactl_dep.found(),
'openwsman': openwsman_dep.found(),
-Index: libvirt-7.5.0/src/interface/meson.build
+Index: libvirt-7.6.0/src/interface/meson.build
===================================================================
---- libvirt-7.5.0.orig/src/interface/meson.build
-+++ libvirt-7.5.0/src/interface/meson.build
+--- libvirt-7.6.0.orig/src/interface/meson.build
++++ libvirt-7.6.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [
'interface_driver.c',
]
@@ -206,10 +206,10 @@ Index: libvirt-7.5.0/src/interface/meson.build
udev_dep,
],
'link_args': [
-Index: libvirt-7.5.0/meson_options.txt
+Index: libvirt-7.6.0/meson_options.txt
===================================================================
---- libvirt-7.5.0.orig/meson_options.txt
-+++ libvirt-7.5.0/meson_options.txt
+--- libvirt-7.6.0.orig/meson_options.txt
++++ libvirt-7.6.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 3fc04dc..ce55068 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 2 20:44:29 UTC 2021 - James Fehlig
+
+- Update to libvirt 7.6.0
+ - storage_driver: Unlock object on ACL fail in storagePoolLookupByTargetPath
+ CVE-2021-3667
+ bsc#1188843
+ - Many incremental improvements and bug fixes, see
+ https://libvirt.org/news.html
+ - Dropped patches:
+ de1e0ae0-lockd-no-error-if-lockspace.patch,
+ f58349c9-qemu-storage-migration.patch
+
-------------------------------------------------------------------
Tue Jul 27 18:10:29 UTC 2021 - James Fehlig
diff --git a/libvirt.spec b/libvirt.spec
index dfebc2d..b668990 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -136,7 +136,7 @@
Name: libvirt
URL: http://libvirt.org/
-Version: 7.5.0
+Version: 7.6.0
Release: 0
Summary: Library providing a virtualization API
License: LGPL-2.1-or-later
@@ -275,8 +275,8 @@ BuildRequires: libssh-devel >= 0.7.0
BuildRequires: firewall-macros
%endif
-Source0: %{name}-%{version}.tar.xz
-Source1: %{name}-%{version}.tar.xz.asc
+Source0: https://libvirt.org/sources/%{name}-%{version}.tar.xz
+Source1: https://libvirt.org/sources/%{name}-%{version}.tar.xz.asc
Source2: %{name}.keyring
Source3: libvirtd-relocation-server.fw
Source4: libvirt-supportconfig
@@ -285,8 +285,6 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf
Source100: %{name}-rpmlintrc
# Upstream patches
-Patch0: de1e0ae0-lockd-no-error-if-lockspace.patch
-Patch1: f58349c9-qemu-storage-migration.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -1037,19 +1035,21 @@ cp %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/default.xml \
rm -f %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/default.xml
rm -f %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/autostart/default.xml
%if ! %{with_lxc}
-rm -rf %{buildroot}/%{_sysconfdir}/%{name}/lxc.conf
+rm -f %{buildroot}/%{_sysconfdir}/%{name}/lxc.conf
rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_lxc.aug
rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.lxc
+rm -f %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.lxc
%endif
%if ! %{with_qemu}
-rm -rf %{buildroot}/%{_sysconfdir}/%{name}/qemu.conf
+rm -f %{buildroot}/%{_sysconfdir}/%{name}/qemu.conf
+rm -f %{buildroot}/%{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_qemu.aug
rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.qemu
+rm -f %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.qemu
%endif
%if ! %{with_libxl}
rm -f %{buildroot}/%{_sysconfdir}/%{name}/libxl.conf
+rm -f %{buildroot}/%{_sysconfdir}/apparmor.d/usr.sbin.virtxend
rm -f %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.libxl
rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_libxl.aug
rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
@@ -1616,6 +1616,7 @@ fi
%files daemon-driver-qemu
%config(noreplace) %{_sysconfdir}/%{name}/virtqemud.conf
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
%{_datadir}/augeas/lenses/virtqemud.aug
%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
%{_unitdir}/virtqemud.service
@@ -1673,6 +1674,7 @@ fi
%files daemon-driver-libxl
%config(noreplace) %{_sysconfdir}/%{name}/virtxend.conf
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.virtxend
%{_datadir}/augeas/lenses/virtxend.aug
%{_datadir}/augeas/lenses/tests/test_virtxend.aug
%{_unitdir}/virtxend.service
diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch
index 8f5cdf9..d596d60 100644
--- 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-7.5.0/src/libxl/libxl_driver.c
+Index: libvirt-7.6.0/src/libxl/libxl_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.5.0/src/libxl/libxl_driver.c
-@@ -1361,6 +1361,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-7.6.0.orig/src/libxl/libxl_driver.c
++++ libvirt-7.6.0/src/libxl/libxl_driver.c
+@@ -1347,6 +1347,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
}
static int
@@ -76,7 +76,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_driver.c
libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags)
{
-@@ -6461,6 +6518,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6445,6 +6502,7 @@ static virHypervisorDriver libxlHypervis
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
.domainReboot = libxlDomainReboot, /* 0.9.0 */
diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch
index 2d2b907..1ea4e39 100644
--- a/libxl-set-cach-mode.patch
+++ b/libxl-set-cach-mode.patch
@@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
-Index: libvirt-7.5.0/src/libxl/libxl_conf.c
+Index: libvirt-7.6.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.5.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
}
diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch
index a3449b9..411d9dc 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.5.0/docs/manpages/virsh.rst
+Index: libvirt-7.6.0/docs/manpages/virsh.rst
===================================================================
---- libvirt-7.5.0.orig/docs/manpages/virsh.rst
-+++ libvirt-7.5.0/docs/manpages/virsh.rst
-@@ -3180,7 +3180,8 @@ migrate
+--- libvirt-7.6.0.orig/docs/manpages/virsh.rst
++++ libvirt-7.6.0/docs/manpages/virsh.rst
+@@ -3184,7 +3184,8 @@ migrate
[--postcopy-bandwidth bandwidth]
[--parallel [--parallel-connections connections]]
[--bandwidth bandwidth] [--tls-destination hostname]
@@ -30,7 +30,7 @@ Index: libvirt-7.5.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*
-@@ -3286,6 +3287,12 @@ parallel connections. The number of such
+@@ -3290,6 +3291,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.5.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.5.0/include/libvirt/libvirt-domain.h
+Index: libvirt-7.6.0/include/libvirt/libvirt-domain.h
===================================================================
---- libvirt-7.5.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-7.5.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
@@ -1079,6 +1079,25 @@ typedef enum {
*/
# define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination"
@@ -73,11 +73,11 @@ Index: libvirt-7.5.0/include/libvirt/libvirt-domain.h
/* Domain migration. */
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
unsigned long flags, const char *dname,
-Index: libvirt-7.5.0/src/libxl/libxl_driver.c
+Index: libvirt-7.6.0/src/libxl/libxl_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.5.0/src/libxl/libxl_driver.c
-@@ -6025,6 +6025,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-7.6.0.orig/src/libxl/libxl_driver.c
++++ libvirt-7.6.0/src/libxl/libxl_driver.c
+@@ -6009,6 +6009,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL;
const char *uri = NULL;
int ret = -1;
@@ -87,7 +87,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_driver.c
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError();
-@@ -6041,6 +6044,15 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6025,6 +6028,15 @@ libxlDomainMigratePerform3Params(virDoma
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_NAME,
&dname) < 0 ||
@@ -103,7 +103,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_driver.c
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI,
&uri) < 0)
-@@ -6055,11 +6067,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6039,11 +6051,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-7.5.0/src/libxl/libxl_driver.c
goto cleanup;
}
-Index: libvirt-7.5.0/src/libxl/libxl_migration.c
+Index: libvirt-7.6.0/src/libxl/libxl_migration.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-7.5.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
static int
libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
@@ -162,7 +162,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
if (ret != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to send migration data to destination host"));
-@@ -898,7 +918,7 @@ struct libxlTunnelControl {
+@@ -893,7 +913,7 @@ struct libxlTunnelControl {
static int
libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver,
virDomainObj *vm,
@@ -171,7 +171,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
virStreamPtr st,
struct libxlTunnelControl **tnl)
{
-@@ -931,7 +951,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
+@@ -926,7 +946,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
virObjectUnlock(vm);
/* Send data to pipe */
@@ -180,7 +180,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
virObjectLock(vm);
out:
-@@ -967,7 +987,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
+@@ -962,7 +982,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
const char *dconnuri G_GNUC_UNUSED,
const char *dname,
const char *uri,
@@ -189,7 +189,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
{
virDomainPtr ddomain = NULL;
virTypedParameterPtr params = NULL;
-@@ -1012,11 +1032,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
+@@ -1007,11 +1027,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.5.0/src/libxl/libxl_migration.c
if (!(st = virStreamNew(dconn, 0)))
goto confirm;
ret = dconn->driver->domainMigratePrepareTunnel3Params
-@@ -1030,7 +1050,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
+@@ -1025,7 +1045,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
if (ret == -1)
goto confirm;
@@ -212,7 +212,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
if (uri_out) {
if (virTypedParamsReplaceString(¶ms, &nparams,
VIR_MIGRATE_PARAM_URI, uri_out) < 0) {
-@@ -1045,11 +1065,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
+@@ -1040,11 +1060,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
}
VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
@@ -227,7 +227,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
if (ret < 0) {
notify_source = false;
virErrorPreserveLast(&orig_err);
-@@ -1084,7 +1104,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
+@@ -1079,7 +1099,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
confirm:
if (notify_source) {
VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@@ -236,7 +236,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
if (ret < 0)
VIR_WARN("Guest %s probably left in 'paused' state on source",
-@@ -1092,7 +1112,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
+@@ -1087,7 +1107,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
}
cleanup:
@@ -245,7 +245,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
libxlMigrationSrcStopTunnel(tc);
virObjectUnref(st);
}
-@@ -1136,7 +1156,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1131,7 +1151,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
const char *dconnuri,
const char *uri_str G_GNUC_UNUSED,
const char *dname,
@@ -254,7 +254,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
{
int ret = -1;
int useParams;
-@@ -1173,7 +1193,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1168,7 +1188,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
}
ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@@ -263,7 +263,7 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
if (ret < 0) {
/*
-@@ -1200,7 +1220,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1195,7 +1215,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.5.0/src/libxl/libxl_migration.c
{
libxlDomainObjPrivate *priv = vm->privateData;
char *hostname = NULL;
-@@ -1236,7 +1256,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1231,7 +1251,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
/* suspend vm and send saved data to dst through socket fd */
virObjectUnlock(vm);
@@ -281,10 +281,10 @@ Index: libvirt-7.5.0/src/libxl/libxl_migration.c
virObjectLock(vm);
if (ret == 0) {
-Index: libvirt-7.5.0/src/libxl/libxl_migration.h
+Index: libvirt-7.6.0/src/libxl/libxl_migration.h
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-7.5.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
@@ -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.5.0/src/libxl/libxl_migration.h
virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-7.5.0/tools/virsh-domain.c
+Index: libvirt-7.6.0/tools/virsh-domain.c
===================================================================
---- libvirt-7.5.0.orig/tools/virsh-domain.c
-+++ libvirt-7.5.0/tools/virsh-domain.c
-@@ -10672,6 +10672,18 @@ static const vshCmdOptDef opts_migrate[]
+--- 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[]
.type = VSH_OT_STRING,
.help = N_("override the destination host name used for TLS verification")
},
@@ -350,7 +350,7 @@ Index: libvirt-7.5.0/tools/virsh-domain.c
{.name = NULL}
};
-@@ -10692,6 +10704,7 @@ doMigrate(void *opaque)
+@@ -10697,6 +10709,7 @@ doMigrate(void *opaque)
unsigned long long ullOpt = 0;
int rv;
virConnectPtr dconn = data->dconn;
@@ -358,7 +358,7 @@ Index: libvirt-7.5.0/tools/virsh-domain.c
#ifndef WIN32
sigset_t sigmask, oldsigmask;
-@@ -10822,6 +10835,22 @@ doMigrate(void *opaque)
+@@ -10827,6 +10840,22 @@ doMigrate(void *opaque)
goto save_error;
}
diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch
index c127b74..b286abb 100644
--- a/libxl-support-block-script.patch
+++ b/libxl-support-block-script.patch
@@ -7,10 +7,10 @@ and npiv.
For more details, see bsc#954872 and FATE#319810
-Index: libvirt-7.5.0/src/libxl/libxl_conf.c
+Index: libvirt-7.6.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.5.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
}
diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch
index 1d90dfb..e5af757 100644
--- a/lxc-wait-after-eth-del.patch
+++ b/lxc-wait-after-eth-del.patch
@@ -13,10 +13,10 @@ device with the same name that is being created.
src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+)
-Index: libvirt-7.5.0/src/lxc/lxc_controller.c
+Index: libvirt-7.6.0/src/lxc/lxc_controller.c
===================================================================
---- libvirt-7.5.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-7.5.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
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1;
@@ -25,10 +25,10 @@ Index: libvirt-7.5.0/src/lxc/lxc_controller.c
return ret;
}
-Index: libvirt-7.5.0/src/lxc/lxc_driver.c
+Index: libvirt-7.6.0/src/lxc/lxc_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-7.5.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
@@ -67,6 +67,7 @@
#include "virtime.h"
#include "virtypedparam.h"
@@ -53,10 +53,10 @@ Index: libvirt-7.5.0/src/lxc/lxc_driver.c
break;
/* It'd be nice to support this, but with macvlan
-Index: libvirt-7.5.0/src/lxc/lxc_process.c
+Index: libvirt-7.6.0/src/lxc/lxc_process.c
===================================================================
---- libvirt-7.5.0.orig/src/lxc/lxc_process.c
-+++ libvirt-7.5.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
@@ -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 e46c969..f0b053a 100644
--- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
+++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck
tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
2 files changed, 8 insertions(+), 2 deletions(-)
-Index: libvirt-7.5.0/src/network/bridge_driver.c
+Index: libvirt-7.6.0/src/network/bridge_driver.c
===================================================================
---- libvirt-7.5.0.orig/src/network/bridge_driver.c
-+++ libvirt-7.5.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
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) {
@@ -37,10 +37,10 @@ Index: libvirt-7.5.0/src/network/bridge_driver.c
}
if (ipdef->tftproot) {
-Index: libvirt-7.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-7.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
===================================================================
---- libvirt-7.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-7.5.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
@@ -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 a258f01..3625924 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.5.0/src/util/virarch.c
+Index: libvirt-7.6.0/src/util/virarch.c
===================================================================
---- libvirt-7.5.0.orig/src/util/virarch.c
-+++ libvirt-7.5.0/src/util/virarch.c
+--- libvirt-7.6.0.orig/src/util/virarch.c
++++ libvirt-7.6.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 b855a82..81f16cc 100644
--- a/qemu-apparmor-screenshot.patch
+++ b/qemu-apparmor-screenshot.patch
@@ -1,8 +1,8 @@
-Index: libvirt-7.5.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-7.6.0/src/security/apparmor/libvirt-qemu
===================================================================
---- libvirt-7.5.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-7.5.0/src/security/apparmor/libvirt-qemu
-@@ -245,3 +245,6 @@
+--- libvirt-7.6.0.orig/src/security/apparmor/libvirt-qemu
++++ libvirt-7.6.0/src/security/apparmor/libvirt-qemu
+@@ -248,3 +248,6 @@
# /sys/bus/nd/devices
/ r, # harmless on any lsb compliant system
/sys/bus/nd/devices/{,**/} r,
diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch
index c4a0f9a..6b25e05 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.5.0/tools/libvirt-guests.sh.in
+Index: libvirt-7.6.0/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-7.5.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-7.5.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
@@ -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 c6e90ce..88c3194 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.5.0/src/remote/remote_daemon_config.c
+Index: libvirt-7.6.0/src/remote/remote_daemon_config.c
===================================================================
---- libvirt-7.5.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-7.5.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
@@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U
#ifdef WITH_IP
@@ -16,10 +16,10 @@ Index: libvirt-7.5.0/src/remote/remote_daemon_config.c
# else /* ! LIBVIRTD */
data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
# endif /* ! LIBVIRTD */
-Index: libvirt-7.5.0/src/remote/libvirtd.conf.in
+Index: libvirt-7.6.0/src/remote/libvirtd.conf.in
===================================================================
---- libvirt-7.5.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-7.5.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
@@ -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.5.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.5.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-7.6.0/src/remote/test_libvirtd.aug.in
===================================================================
---- libvirt-7.5.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-7.5.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
@@ -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 68c461d..2c24c9f 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.5.0/src/libxl/libxl.conf
+Index: libvirt-7.6.0/src/libxl/libxl.conf
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl.conf
-+++ libvirt-7.5.0/src/libxl/libxl.conf
+--- libvirt-7.6.0.orig/src/libxl/libxl.conf
++++ libvirt-7.6.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
# Enable autoballooning of domain0
@@ -27,10 +27,10 @@ Index: libvirt-7.5.0/src/libxl/libxl.conf
# In order to prevent accidentally starting two domains that
-Index: libvirt-7.5.0/src/libxl/libxl_conf.c
+Index: libvirt-7.6.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.5.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
/*
* Get domain0 autoballoon configuration. Honor user-specified
@@ -66,10 +66,10 @@ Index: libvirt-7.5.0/src/libxl/libxl_conf.c
return 0;
}
-Index: libvirt-7.5.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-7.6.0/src/libxl/test_libvirtd_libxl.aug.in
===================================================================
---- libvirt-7.5.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-7.5.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
@@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
@CONFIG@
diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch
index 4641c62..5c0d8b5 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.5.0/src/qemu/qemu.conf
+Index: libvirt-7.6.0/src/qemu/qemu.conf
===================================================================
---- libvirt-7.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-7.5.0/src/qemu/qemu.conf
+--- libvirt-7.6.0.orig/src/qemu/qemu.conf
++++ libvirt-7.6.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.5.0/src/qemu/qemu.conf
#
#lock_manager = "lockd"
-Index: libvirt-7.5.0/src/qemu/qemu_conf.c
+Index: libvirt-7.6.0/src/qemu/qemu_conf.c
===================================================================
---- libvirt-7.5.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-7.5.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
@@ -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.5.0/src/qemu/qemu_conf.c
cfg->securityRequireConfined = false;
cfg->keepAliveInterval = 5;
-Index: libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.6.0/src/qemu/test_libvirtd_qemu.aug.in
===================================================================
---- libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-7.5.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
@@ -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 84022b0..85006e6 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.5.0/src/qemu/qemu.conf
+Index: libvirt-7.6.0/src/qemu/qemu.conf
===================================================================
---- libvirt-7.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-7.5.0/src/qemu/qemu.conf
+--- libvirt-7.6.0.orig/src/qemu/qemu.conf
++++ libvirt-7.6.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.5.0/src/qemu/qemu.conf
#]
# The backend to use for handling stdout/stderr output from
-Index: libvirt-7.5.0/src/qemu/qemu_conf.c
+Index: libvirt-7.6.0/src/qemu/qemu_conf.c
===================================================================
---- libvirt-7.5.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-7.5.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
@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver)
#ifndef DEFAULT_LOADER_NVRAM
@@ -41,10 +41,10 @@ Index: libvirt-7.5.0/src/qemu/qemu_conf.c
#endif
-Index: libvirt-7.5.0/src/security/virt-aa-helper.c
+Index: libvirt-7.6.0/src/security/virt-aa-helper.c
===================================================================
---- libvirt-7.5.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-7.5.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
@@ -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.5.0/src/security/virt-aa-helper.c
};
/* override the above with these */
const char * const override[] = {
-Index: libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.6.0/src/qemu/test_libvirtd_qemu.aug.in
===================================================================
---- libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-7.5.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
@@ -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 9f608f7..d58421c 100644
--- a/suse-xen-ovmf-paths.patch
+++ b/suse-xen-ovmf-paths.patch
@@ -5,10 +5,10 @@ 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.5.0/src/libxl/libxl_conf.c
+Index: libvirt-7.6.0/src/libxl/libxl_conf.c
===================================================================
---- libvirt-7.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.5.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)
cfg->firmwares = g_new0(virFirmware *, 1);
cfg->nfirmwares = 1;
diff --git a/virt-create-rootfs.patch b/virt-create-rootfs.patch
index 2ddd8af..6544ff9 100644
--- a/virt-create-rootfs.patch
+++ b/virt-create-rootfs.patch
@@ -1,7 +1,7 @@
-Index: libvirt-7.5.0/tools/virt-create-rootfs
+Index: libvirt-7.6.0/tools/virt-create-rootfs
===================================================================
--- /dev/null
-+++ libvirt-7.5.0/tools/virt-create-rootfs
++++ libvirt-7.6.0/tools/virt-create-rootfs
@@ -0,0 +1,231 @@
+#!/bin/sh
+set -e
@@ -234,10 +234,10 @@ Index: libvirt-7.5.0/tools/virt-create-rootfs
+ echo "pts/0" >> "$ROOT/etc/securetty"
+ chroot "$ROOT" /usr/bin/passwd
+fi
-Index: libvirt-7.5.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-7.6.0/docs/manpages/virt-create-rootfs.rst
===================================================================
--- /dev/null
-+++ libvirt-7.5.0/docs/manpages/virt-create-rootfs.rst
++++ libvirt-7.6.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@
+==================
+virt-create-rootfs
@@ -327,10 +327,10 @@ Index: libvirt-7.5.0/docs/manpages/virt-create-rootfs.rst
+========
+
+virsh(1), `https://libvirt.org/ `_
-Index: libvirt-7.5.0/docs/manpages/meson.build
+Index: libvirt-7.6.0/docs/manpages/meson.build
===================================================================
---- libvirt-7.5.0.orig/docs/manpages/meson.build
-+++ libvirt-7.5.0/docs/manpages/meson.build
+--- libvirt-7.6.0.orig/docs/manpages/meson.build
++++ libvirt-7.6.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.5.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.5.0/tools/meson.build
+Index: libvirt-7.6.0/tools/meson.build
===================================================================
---- libvirt-7.5.0.orig/tools/meson.build
-+++ libvirt-7.5.0/tools/meson.build
+--- libvirt-7.6.0.orig/tools/meson.build
++++ libvirt-7.6.0/tools/meson.build
@@ -149,6 +149,8 @@ else
virsh_icon_res = []
endif