Currently migration parameters are stored in a structure which mimics
the QEMU migration parameters handled by query-migrate-parameters and
migrate-set-parameters. The new structure will become a libvirt's
abstraction on top of QEMU migration parameters, capabilities, and
related stuff.
Signed-off-by: Jiri Denemark
---
src/qemu/qemu_driver.c | 6 ++--
src/qemu/qemu_migration.c| 26 +++---
src/qemu/qemu_migration.h| 2 +-
src/qemu/qemu_migration_params.c | 62
src/qemu/qemu_migration_params.h | 21 +++
5 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c157ff9bb0..6e6fc130c5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12241,7 +12241,7 @@ qemuDomainMigratePerform(virDomainPtr dom,
int ret = -1;
const char *dconnuri = NULL;
qemuMigrationCompressionPtr compression = NULL;
-qemuMonitorMigrationParamsPtr migParams = NULL;
+qemuMigrationParamsPtr migParams = NULL;
virCheckFlags(QEMU_MIGRATION_FLAGS, -1);
@@ -12669,7 +12669,7 @@ qemuDomainMigratePerform3(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm;
qemuMigrationCompressionPtr compression = NULL;
-qemuMonitorMigrationParamsPtr migParams = NULL;
+qemuMigrationParamsPtr migParams = NULL;
int ret = -1;
virCheckFlags(QEMU_MIGRATION_FLAGS, -1);
@@ -12725,7 +12725,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
unsigned long long bandwidth = 0;
int nbdPort = 0;
qemuMigrationCompressionPtr compression = NULL;
-qemuMonitorMigrationParamsPtr migParams = NULL;
+qemuMigrationParamsPtr migParams = NULL;
int ret = -1;
virCheckFlags(QEMU_MIGRATION_FLAGS, -1);
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a0061c8c83..055d8a674a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2251,7 +2251,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
int rv;
char *tlsAlias = NULL;
char *secAlias = NULL;
-qemuMonitorMigrationParamsPtr migParams = NULL;
+qemuMigrationParamsPtr migParams = NULL;
virNWFilterReadLockFilterUpdates();
@@ -2465,7 +2465,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
goto stopjob;
/* Force reset of 'tls-hostname', it's a source only parameter */
-if (VIR_STRDUP(migParams->tlsHostname, "") < 0)
+if (VIR_STRDUP(migParams->params.tlsHostname, "") < 0)
goto stopjob;
} else {
@@ -3337,7 +3337,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
size_t nmigrate_disks,
const char **migrate_disks,
qemuMigrationCompressionPtr compression,
-qemuMonitorMigrationParamsPtr migParams)
+qemuMigrationParamsPtr migParams)
{
int ret = -1;
unsigned int migrate_flags = QEMU_MONITOR_MIGRATE_BACKGROUND;
@@ -3426,11 +3426,11 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
* connect directly to the destination. */
if (spec->destType == MIGRATION_DEST_CONNECT_HOST ||
spec->destType == MIGRATION_DEST_FD) {
-if (VIR_STRDUP(migParams->tlsHostname, spec->dest.host.name) < 0)
+if (VIR_STRDUP(migParams->params.tlsHostname,
spec->dest.host.name) < 0)
goto error;
} else {
/* Be sure there's nothing from a previous migration */
-if (VIR_STRDUP(migParams->tlsHostname, "") < 0)
+if (VIR_STRDUP(migParams->params.tlsHostname, "") < 0)
goto error;
}
} else {
@@ -3733,7 +3733,7 @@ qemuMigrationSrcPerformNative(virQEMUDriverPtr driver,
size_t nmigrate_disks,
const char **migrate_disks,
qemuMigrationCompressionPtr compression,
- qemuMonitorMigrationParamsPtr migParams)
+ qemuMigrationParamsPtr migParams)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
virURIPtr uribits = NULL;
@@ -3812,7 +3812,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver,
size_t nmigrate_disks,
const char **migrate_disks,
qemuMigrationCompressionPtr compression,
- qemuMonitorMigrationParamsPtr migParams)
+ qemuMigrationParamsPtr migParams)
{
int ret = -1;
qemuMigrationSpec spec;
@@ -3884,7 +3884,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver,
virStreamPtr st = NULL;
unsigned long destflags;
qemuMigrationCompressionPtr compression = NULL;
-qemuMonitorMigrationParamsPtr migParams = NULL;
+qemuMigrationParamsPtr migParams = NULL;
VIR
