2016-06-24 19:07:56 +02:00
|
|
|
From 6409e928eb4c2287dca59b139650fab77ea99fb8 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Olaf Hering <olaf@aepfle.de>
|
|
|
|
Date: Fri, 9 May 2014 11:55:31 -0600
|
|
|
|
Subject: [PATCH] libvirt: set migration constraints from cmdline
|
|
|
|
|
|
|
|
References: fate#316614
|
|
|
|
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
|
---
|
|
|
|
include/libvirt/libvirt-domain.h | 25 +++++++++++++++++++++++++
|
|
|
|
src/libxl/libxl_driver.c | 17 ++++++++++++++++-
|
|
|
|
src/libxl/libxl_migration.c | 29 +++++++++++++++++++++++++----
|
|
|
|
src/libxl/libxl_migration.h | 14 +++++++++++++-
|
|
|
|
tools/virsh-domain.c | 38 ++++++++++++++++++++++++++++++++++++++
|
|
|
|
tools/virsh.pod | 8 ++++++++
|
|
|
|
6 files changed, 125 insertions(+), 6 deletions(-)
|
|
|
|
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/docs/manpages/virsh.rst
|
2021-01-05 16:51:25 +01:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/docs/manpages/virsh.rst
|
|
|
|
+++ libvirt-7.7.0/docs/manpages/virsh.rst
|
|
|
|
@@ -3167,7 +3167,8 @@ migrate
|
2021-01-05 16:51:25 +01:00
|
|
|
[--postcopy-bandwidth bandwidth]
|
|
|
|
[--parallel [--parallel-connections connections]]
|
|
|
|
[--bandwidth bandwidth] [--tls-destination hostname]
|
|
|
|
- [--disks-uri URI]
|
|
|
|
+ [--disks-uri URI] [--max_iters num]
|
|
|
|
+ [--min_remaining num] [--abort_if_busy]
|
|
|
|
|
|
|
|
Migrate domain to another host. Add *--live* for live migration; <--p2p>
|
|
|
|
for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled*
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -3273,6 +3274,12 @@ parallel connections. The number of such
|
2021-01-05 16:51:25 +01:00
|
|
|
network link between the source and the target and thus speeding up the
|
|
|
|
migration.
|
|
|
|
|
|
|
|
+SUSE-specific options for Xen: *--max_iters* allows specifying the maximum
|
|
|
|
+number of iterations before final suspend. Default is 2. *--min_remaining*
|
|
|
|
+allows specifying the number of dirty pages before final suspend. Default is 50.
|
|
|
|
+*--abort_if_busy* can be used to abort the migration instead of doing the final
|
|
|
|
+suspend for domUs with busy workloads, to avoid a long suspend-time of the domU.
|
|
|
|
+
|
|
|
|
Running migration can be canceled by interrupting virsh (usually using
|
|
|
|
``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance.
|
|
|
|
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/include/libvirt/libvirt-domain.h
|
2016-06-24 19:07:56 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/include/libvirt/libvirt-domain.h
|
|
|
|
+++ libvirt-7.7.0/include/libvirt/libvirt-domain.h
|
2021-06-01 18:52:45 +02:00
|
|
|
@@ -1079,6 +1079,25 @@ typedef enum {
|
2016-06-24 19:07:56 +02:00
|
|
|
*/
|
2020-01-16 02:52:12 +01:00
|
|
|
# define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination"
|
2016-06-24 19:07:56 +02:00
|
|
|
|
|
|
|
+/**
|
|
|
|
+ * VIR_MIGRATE_PARAM_SUSE_MAX_ITERS:
|
|
|
|
+ *
|
|
|
|
+ * virDomainMigrate* params field: xc_domain_save max_iters
|
|
|
|
+ */
|
|
|
|
+#define VIR_MIGRATE_PARAM_SUSE_MAX_ITERS "max_iters"
|
|
|
|
+/**
|
|
|
|
+ * VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING:
|
|
|
|
+ *
|
|
|
|
+ * virDomainMigrate* params field: xc_domain_save min_remaining
|
|
|
|
+ */
|
|
|
|
+#define VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING "min_remaining"
|
|
|
|
+/**
|
|
|
|
+ * VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY:
|
|
|
|
+ *
|
|
|
|
+ * virDomainMigrate* params field: xc_domain_save abort_if_busy
|
|
|
|
+ */
|
|
|
|
+#define VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY "abort_if_busy"
|
|
|
|
+
|
|
|
|
/* Domain migration. */
|
|
|
|
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
|
|
|
|
unsigned long flags, const char *dname,
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/src/libxl/libxl_driver.c
|
2016-06-24 19:07:56 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/src/libxl/libxl_driver.c
|
|
|
|
+++ libvirt-7.7.0/src/libxl/libxl_driver.c
|
2021-09-14 23:02:46 +02:00
|
|
|
@@ -6005,6 +6005,9 @@ libxlDomainMigratePerform3Params(virDoma
|
2016-06-24 19:07:56 +02:00
|
|
|
const char *dname = NULL;
|
|
|
|
const char *uri = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
+ libxlDomainMigrationProps props = {
|
|
|
|
+ .virFlags = flags,
|
|
|
|
+ };
|
|
|
|
|
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
2021-09-14 23:02:46 +02:00
|
|
|
@@ -6021,6 +6024,15 @@ libxlDomainMigratePerform3Params(virDoma
|
2016-06-24 19:07:56 +02:00
|
|
|
virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_DEST_NAME,
|
|
|
|
&dname) < 0 ||
|
|
|
|
+ virTypedParamsGetUInt(params, nparams,
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_MAX_ITERS,
|
|
|
|
+ &props.max_iters) < 0 ||
|
|
|
|
+ virTypedParamsGetUInt(params, nparams,
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING,
|
|
|
|
+ &props.min_remaining) < 0 ||
|
|
|
|
+ virTypedParamsGetUInt(params, nparams,
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY,
|
|
|
|
+ &props.abort_if_busy) < 0 ||
|
|
|
|
virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_URI,
|
|
|
|
&uri) < 0)
|
2021-09-14 23:02:46 +02:00
|
|
|
@@ -6035,11 +6047,11 @@ libxlDomainMigratePerform3Params(virDoma
|
2016-06-24 19:07:56 +02:00
|
|
|
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
|
|
|
|
- dconnuri, uri, dname, flags) < 0)
|
|
|
|
+ dconnuri, uri, dname, &props) < 0)
|
2016-06-24 19:07:56 +02:00
|
|
|
goto cleanup;
|
|
|
|
} else {
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
if (libxlDomainMigrationSrcPerform(driver, vm, dom_xml, dconnuri,
|
|
|
|
- uri, dname, flags) < 0)
|
|
|
|
+ uri, dname, &props) < 0)
|
2016-06-24 19:07:56 +02:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/src/libxl/libxl_migration.c
|
2016-06-24 19:07:56 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/src/libxl/libxl_migration.c
|
|
|
|
+++ libvirt-7.7.0/src/libxl/libxl_migration.c
|
|
|
|
@@ -334,18 +334,38 @@ libxlMigrateDstReceive(virNetSocket *soc
|
2016-06-24 19:07:56 +02:00
|
|
|
static int
|
2021-05-18 00:14:02 +02:00
|
|
|
libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
|
|
|
|
virDomainObj *vm,
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
- unsigned long flags,
|
|
|
|
+ const libxlDomainMigrationProps *props,
|
|
|
|
int sockfd)
|
2016-06-24 19:07:56 +02:00
|
|
|
{
|
2021-05-18 00:14:02 +02:00
|
|
|
libxlDriverConfig *cfg = libxlDriverConfigGet(driver);
|
2016-06-24 19:07:56 +02:00
|
|
|
+#ifdef LIBXL_HAVE_DOMAIN_SUSPEND_SUSE
|
|
|
|
+ libxl_domain_suspend_suse_properties libxl_props = {
|
|
|
|
+ .flags = 0,
|
|
|
|
+ };
|
|
|
|
+#else
|
|
|
|
int xl_flags = 0;
|
|
|
|
+#endif
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
- if (flags & VIR_MIGRATE_LIVE)
|
|
|
|
+#ifdef LIBXL_HAVE_DOMAIN_SUSPEND_SUSE
|
|
|
|
+ if (props->virFlags & VIR_MIGRATE_LIVE)
|
|
|
|
+ libxl_props.flags |= LIBXL_SUSPEND_LIVE;
|
|
|
|
+
|
|
|
|
+ libxl_props.max_iters = props->max_iters;
|
|
|
|
+ libxl_props.min_remaining = props->min_remaining;
|
|
|
|
+ if (props->abort_if_busy)
|
|
|
|
+ libxl_props.flags |= LIBXL_SUSPEND_ABORT_IF_BUSY;
|
|
|
|
+
|
|
|
|
+ ret = libxl_domain_suspend_suse(cfg->ctx, vm->def->id, sockfd,
|
|
|
|
+ &libxl_props, NULL);
|
|
|
|
+#else
|
|
|
|
+ if (props->virFlags & VIR_MIGRATE_LIVE)
|
|
|
|
xl_flags = LIBXL_SUSPEND_LIVE;
|
|
|
|
|
|
|
|
ret = libxl_domain_suspend(cfg->ctx, vm->def->id, sockfd,
|
|
|
|
xl_flags, NULL);
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
if (ret != 0) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("Failed to send migration data to destination host"));
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -887,7 +907,7 @@ struct libxlTunnelControl {
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
static int
|
2021-05-18 00:14:02 +02:00
|
|
|
libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver,
|
|
|
|
virDomainObj *vm,
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
- unsigned long flags,
|
|
|
|
+ const libxlDomainMigrationProps *props,
|
|
|
|
virStreamPtr st,
|
|
|
|
struct libxlTunnelControl **tnl)
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
{
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -920,7 +940,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
/* Send data to pipe */
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
- ret = libxlDoMigrateSrcSend(driver, vm, flags, tc->dataFD[1]);
|
|
|
|
+ ret = libxlDoMigrateSrcSend(driver, vm, props, tc->dataFD[1]);
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
virObjectLock(vm);
|
|
|
|
|
|
|
|
out:
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -956,7 +976,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
|
2019-11-06 16:48:56 +01:00
|
|
|
const char *dconnuri G_GNUC_UNUSED,
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
const char *dname,
|
|
|
|
const char *uri,
|
|
|
|
- unsigned int flags)
|
|
|
|
+ const libxlDomainMigrationProps *props)
|
2016-06-24 19:07:56 +02:00
|
|
|
{
|
|
|
|
virDomainPtr ddomain = NULL;
|
|
|
|
virTypedParameterPtr params = NULL;
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1001,11 +1021,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
|
2016-06-24 19:07:56 +02:00
|
|
|
/* We don't require the destination to have P2P support
|
2019-01-16 00:46:12 +01:00
|
|
|
* as it looks to be normal migration from the receiver perspective.
|
2016-06-24 19:07:56 +02:00
|
|
|
*/
|
|
|
|
- destflags = flags & ~(VIR_MIGRATE_PEER2PEER);
|
|
|
|
+ destflags = props->virFlags & ~(VIR_MIGRATE_PEER2PEER);
|
|
|
|
|
|
|
|
VIR_DEBUG("Prepare3");
|
|
|
|
virObjectUnlock(vm);
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
- if (flags & VIR_MIGRATE_TUNNELLED) {
|
|
|
|
+ if (props->virFlags & VIR_MIGRATE_TUNNELLED) {
|
|
|
|
if (!(st = virStreamNew(dconn, 0)))
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
goto confirm;
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
ret = dconn->driver->domainMigratePrepareTunnel3Params
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1019,7 +1039,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
if (ret == -1)
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
goto confirm;
|
2016-06-24 19:07:56 +02:00
|
|
|
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
- if (!(flags & VIR_MIGRATE_TUNNELLED)) {
|
|
|
|
+ if (!(props->virFlags & VIR_MIGRATE_TUNNELLED)) {
|
|
|
|
if (uri_out) {
|
|
|
|
if (virTypedParamsReplaceString(¶ms, &nparams,
|
|
|
|
VIR_MIGRATE_PARAM_URI, uri_out) < 0) {
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1034,11 +1054,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
}
|
2016-06-24 19:07:56 +02:00
|
|
|
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
|
|
|
|
- if (flags & VIR_MIGRATE_TUNNELLED)
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
- ret = libxlMigrationSrcStartTunnel(driver, vm, flags, st, &tc);
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
+ if (props->virFlags & VIR_MIGRATE_TUNNELLED)
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
+ ret = libxlMigrationSrcStartTunnel(driver, vm, props, st, &tc);
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
else
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
ret = libxlDomainMigrationSrcPerform(driver, vm, NULL, NULL,
|
|
|
|
- uri_out, NULL, flags);
|
|
|
|
+ uri_out, NULL, props);
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
if (ret < 0) {
|
|
|
|
notify_source = false;
|
2019-11-06 16:48:56 +01:00
|
|
|
virErrorPreserveLast(&orig_err);
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1073,7 +1093,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
confirm:
|
|
|
|
if (notify_source) {
|
|
|
|
VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
|
|
|
|
- ret = libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled);
|
|
|
|
+ ret = libxlDomainMigrationSrcConfirm(driver, vm, props->virFlags, cancelled);
|
2016-06-24 19:07:56 +02:00
|
|
|
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
if (ret < 0)
|
|
|
|
VIR_WARN("Guest %s probably left in 'paused' state on source",
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1081,7 +1101,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
}
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
|
|
|
|
cleanup:
|
|
|
|
- if (flags & VIR_MIGRATE_TUNNELLED) {
|
|
|
|
+ if (props->virFlags & VIR_MIGRATE_TUNNELLED) {
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
libxlMigrationSrcStopTunnel(tc);
|
Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
- Modularize storage driver by splitting it into backend-specific
subpackages
- CVE-2017-2635, bsc#1027075
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
b018ada3-shunloadtest-build-fix.patch,
f86a7a83-libxl-dom0-balloon-fix.patch,
6e4759d0-libxl-timer-fix.patch,
87df87e0-libxl-timer-tsc-emulate.patch,
b4386fda-xenconfig-timer-fix.patch,
d3970925-timer-tests.patch,
321a28c6-libxl-default-disk-format.patch,
bd116810-libxl-fix-disk-detach.patch,
ff225538-libxl-autoballoon-setting.patch,
c89a6e78-libxl-physinfo-cleanup.patch,
d2b77608-libxl-maxmem-fix.patch,
79692c38-libxl-dom0-maxmem.patch,
4ab0c959-libxl-mem-leak.patch,
2dc1cf19-libxl-double-free.patch,
apparmor-errormsg-fix.patch,
apparmor-alt-seclabel.patch,
qemu-disable-namespaces.patch
OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 16:02:55 +01:00
|
|
|
virObjectUnref(st);
|
|
|
|
}
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1125,7 +1145,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
const char *dconnuri,
|
2019-11-06 16:48:56 +01:00
|
|
|
const char *uri_str G_GNUC_UNUSED,
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
const char *dname,
|
|
|
|
- unsigned int flags)
|
|
|
|
+ const libxlDomainMigrationProps *props)
|
2016-06-24 19:07:56 +02:00
|
|
|
{
|
|
|
|
int ret = -1;
|
2021-01-20 00:09:19 +01:00
|
|
|
int useParams;
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1162,7 +1182,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
|
2016-06-24 19:07:56 +02:00
|
|
|
}
|
|
|
|
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
|
|
|
|
- dname, uri_str, flags);
|
|
|
|
+ dname, uri_str, props);
|
2016-06-24 19:07:56 +02:00
|
|
|
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
if (ret < 0) {
|
|
|
|
/*
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1189,7 +1209,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
|
2019-11-06 16:48:56 +01:00
|
|
|
const char *dconnuri G_GNUC_UNUSED,
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
const char *uri_str,
|
2019-11-06 16:48:56 +01:00
|
|
|
const char *dname G_GNUC_UNUSED,
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
- unsigned int flags)
|
|
|
|
+ const libxlDomainMigrationProps *props)
|
2016-06-24 19:07:56 +02:00
|
|
|
{
|
2021-05-18 00:14:02 +02:00
|
|
|
libxlDomainObjPrivate *priv = vm->privateData;
|
2016-06-24 19:07:56 +02:00
|
|
|
char *hostname = NULL;
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -1225,7 +1245,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
|
2016-06-24 19:07:56 +02:00
|
|
|
|
|
|
|
/* suspend vm and send saved data to dst through socket fd */
|
|
|
|
virObjectUnlock(vm);
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
- ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd);
|
|
|
|
+ ret = libxlDoMigrateSrcSend(driver, vm, props, sockfd);
|
2016-06-24 19:07:56 +02:00
|
|
|
virObjectLock(vm);
|
|
|
|
|
2019-11-14 18:47:53 +01:00
|
|
|
if (ret == 0) {
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/src/libxl/libxl_migration.h
|
2016-06-24 19:07:56 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/src/libxl/libxl_migration.h
|
|
|
|
+++ libvirt-7.7.0/src/libxl/libxl_migration.h
|
2021-01-05 16:51:25 +01:00
|
|
|
@@ -35,6 +35,9 @@
|
2016-06-24 19:07:56 +02:00
|
|
|
VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \
|
|
|
|
VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \
|
|
|
|
VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, VIR_TYPED_PARAM_UINT, \
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, VIR_TYPED_PARAM_UINT, \
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, VIR_TYPED_PARAM_UINT, \
|
|
|
|
NULL
|
|
|
|
|
|
|
|
char *
|
2021-01-05 16:51:25 +01:00
|
|
|
@@ -66,6 +69,13 @@ libxlDomainMigrationDstPrepare(virConnec
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
int cookieinlen,
|
|
|
|
unsigned int flags);
|
2016-06-24 19:07:56 +02:00
|
|
|
|
|
|
|
+typedef struct {
|
|
|
|
+ unsigned int virFlags;
|
|
|
|
+ unsigned int max_iters;
|
|
|
|
+ unsigned int min_remaining;
|
|
|
|
+ unsigned int abort_if_busy;
|
|
|
|
+} libxlDomainMigrationProps;
|
|
|
|
+
|
|
|
|
int
|
2021-05-18 00:14:02 +02:00
|
|
|
libxlDomainMigrationSrcPerformP2P(libxlDriverPrivate *driver,
|
|
|
|
virDomainObj *vm,
|
2021-01-05 16:51:25 +01:00
|
|
|
@@ -74,7 +84,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
const char *dconnuri,
|
|
|
|
const char *uri_str,
|
|
|
|
const char *dname,
|
|
|
|
- unsigned int flags);
|
|
|
|
+ const libxlDomainMigrationProps *props);
|
|
|
|
|
|
|
|
int
|
2021-05-18 00:14:02 +02:00
|
|
|
libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver,
|
2021-01-05 16:51:25 +01:00
|
|
|
@@ -83,7 +93,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
|
2016-06-24 19:07:56 +02:00
|
|
|
const char *dconnuri,
|
|
|
|
const char *uri_str,
|
|
|
|
const char *dname,
|
|
|
|
- unsigned int flags);
|
|
|
|
+ const libxlDomainMigrationProps *props);
|
|
|
|
|
|
|
|
virDomainPtr
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
libxlDomainMigrationDstFinish(virConnectPtr dconn,
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/tools/virsh-domain.c
|
2016-06-24 19:07:56 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/tools/virsh-domain.c
|
|
|
|
+++ libvirt-7.7.0/tools/virsh-domain.c
|
|
|
|
@@ -10439,6 +10439,18 @@ static const vshCmdOptDef opts_migrate[]
|
2020-01-16 02:52:12 +01:00
|
|
|
.type = VSH_OT_STRING,
|
|
|
|
.help = N_("override the destination host name used for TLS verification")
|
2016-06-24 19:07:56 +02:00
|
|
|
},
|
|
|
|
+ {.name = "max_iters",
|
|
|
|
+ .type = VSH_OT_INT,
|
2021-01-05 16:51:25 +01:00
|
|
|
+ .help = N_("SUSE libxl: Number of iterations before final suspend (default: 2).")
|
2016-06-24 19:07:56 +02:00
|
|
|
+ },
|
|
|
|
+ {.name = "min_remaining",
|
|
|
|
+ .type = VSH_OT_INT,
|
|
|
|
+ .help = N_("SUSE libxl: Number of dirty pages before final suspend (default: 50).")
|
|
|
|
+ },
|
|
|
|
+ {.name = "abort_if_busy",
|
|
|
|
+ .type = VSH_OT_BOOL,
|
|
|
|
+ .help = N_("SUSE libxl: Abort migration instead of doing final suspend.")
|
|
|
|
+ },
|
|
|
|
{.name = NULL}
|
|
|
|
};
|
|
|
|
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -10459,6 +10471,7 @@ doMigrate(void *opaque)
|
2016-06-24 19:07:56 +02:00
|
|
|
unsigned long long ullOpt = 0;
|
|
|
|
int rv;
|
|
|
|
virConnectPtr dconn = data->dconn;
|
|
|
|
+ unsigned int uint_opt = 0;
|
2020-03-10 02:55:25 +01:00
|
|
|
#ifndef WIN32
|
|
|
|
sigset_t sigmask, oldsigmask;
|
2016-06-24 19:07:56 +02:00
|
|
|
|
2021-09-01 18:17:27 +02:00
|
|
|
@@ -10589,6 +10602,22 @@ doMigrate(void *opaque)
|
2016-06-24 19:07:56 +02:00
|
|
|
goto save_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (vshCommandOptUInt(ctl, cmd, "max_iters", &uint_opt) > 0 && uint_opt) {
|
|
|
|
+ if (virTypedParamsAddUInt(¶ms, &nparams, &maxparams,
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, uint_opt) < 0)
|
|
|
|
+ goto save_error;
|
|
|
|
+ }
|
|
|
|
+ if (vshCommandOptUInt(ctl, cmd, "min_remaining", &uint_opt) > 0 && uint_opt) {
|
|
|
|
+ if (virTypedParamsAddUInt(¶ms, &nparams, &maxparams,
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, uint_opt) < 0)
|
|
|
|
+ goto save_error;
|
|
|
|
+ }
|
|
|
|
+ if (vshCommandOptBool(cmd, "abort_if_busy")) {
|
|
|
|
+ if (virTypedParamsAddUInt(¶ms, &nparams, &maxparams,
|
|
|
|
+ VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, 1) < 0)
|
|
|
|
+ goto save_error;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
|
|
|
|
goto out;
|
|
|
|
if (opt) {
|