NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: migration: Remove 'nmigration_disks' variable from all places

Browse Source 
Now that none of the functions need it we can drop it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa
2024-09-27 14:30:13 +02:00
parent aaefaabf5a
commit 448b14f74d
3 changed files with 53 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/qemu/qemu_driver.c
View File

@@ -10732,7 +10732,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn,
return qemuMigrationDstPrepareDirect(driver, dconn, return qemuMigrationDstPrepareDirect(driver, dconn,
NULL, 0, NULL, NULL, /* No cookies */ NULL, 0, NULL, NULL, /* No cookies */
uri_in, uri_out, uri_in, uri_out,
&def, origname, NULL, 0, NULL, 0, NULL, &def, origname, NULL, NULL, 0, NULL,
migParams, flags); migParams, flags);
} }
@@ -10782,7 +10782,7 @@ qemuDomainMigratePerform(virDomainPtr dom,
* Consume any cookie we were able to decode though * Consume any cookie we were able to decode though
*/ */
ret = qemuMigrationSrcPerform(driver, dom->conn, vm, NULL, ret = qemuMigrationSrcPerform(driver, dom->conn, vm, NULL,
NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0, NULL, dconnuri, uri, NULL, NULL, NULL, 0,
NULL, NULL,
migParams, cookie, cookielen, migParams, cookie, cookielen,
NULL, NULL, /* No output cookies in v2 */ NULL, NULL, /* No output cookies in v2 */
@@ -10858,7 +10858,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain,
} }
return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname,
cookieout, cookieoutlen, 0, NULL, flags); cookieout, cookieoutlen, NULL, flags);
} }
static char * static char *
@@ -10872,7 +10872,6 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain,
const char *xmlin = NULL; const char *xmlin = NULL;
const char *dname = NULL; const char *dname = NULL;
g_autofree const char **migrate_disks = NULL; g_autofree const char **migrate_disks = NULL;
int nmigrate_disks;
virDomainObj *vm; virDomainObj *vm;
virCheckFlags(QEMU_MIGRATION_FLAGS, NULL); virCheckFlags(QEMU_MIGRATION_FLAGS, NULL);
@@ -10887,12 +10886,8 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain,
&dname) < 0) &dname) < 0)
return NULL; return NULL;
nmigrate_disks = virTypedParamsGetStringList(params, nparams, virTypedParamsGetStringList(params, nparams, VIR_MIGRATE_PARAM_MIGRATE_DISKS,
VIR_MIGRATE_PARAM_MIGRATE_DISKS, &migrate_disks);
&migrate_disks);
if (nmigrate_disks < 0)
return NULL;
if (!(vm = qemuDomainObjFromDomain(domain))) if (!(vm = qemuDomainObjFromDomain(domain)))
return NULL; return NULL;
@@ -10904,7 +10899,7 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain,
return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname,
cookieout, cookieoutlen, cookieout, cookieoutlen,
nmigrate_disks, migrate_disks, flags); migrate_disks, flags);
} }
@@ -10951,7 +10946,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
uri_in, uri_out, uri_in, uri_out,
&def, origname, NULL, 0, NULL, 0, &def, origname, NULL, NULL, 0,
NULL, migParams, flags); NULL, migParams, flags);
} }
@@ -10974,7 +10969,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
const char *uri_in = NULL; const char *uri_in = NULL;
const char *listenAddress = NULL; const char *listenAddress = NULL;
int nbdPort = 0; int nbdPort = 0;
int nmigrate_disks;
g_autofree const char **migrate_disks = NULL; g_autofree const char **migrate_disks = NULL;
g_autofree char *origname = NULL; g_autofree char *origname = NULL;
g_autoptr(qemuMigrationParams) migParams = NULL; g_autoptr(qemuMigrationParams) migParams = NULL;
@@ -11004,19 +10998,15 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
&nbdPort) < 0) &nbdPort) < 0)
return -1; return -1;
nmigrate_disks = virTypedParamsGetStringList(params, nparams, virTypedParamsGetStringList(params, nparams, VIR_MIGRATE_PARAM_MIGRATE_DISKS,
VIR_MIGRATE_PARAM_MIGRATE_DISKS, &migrate_disks);
&migrate_disks);
if (nmigrate_disks < 0)
return -1;
if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags, if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags,
QEMU_MIGRATION_DESTINATION))) QEMU_MIGRATION_DESTINATION)))
return -1; return -1;
if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) || if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) ||
nmigrate_disks > 0) { migrate_disks) {
if (uri_in && STRPREFIX(uri_in, "unix:") && !nbdURI) { if (uri_in && STRPREFIX(uri_in, "unix:") && !nbdURI) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("NBD URI must be supplied when migration URI uses UNIX transport method")); _("NBD URI must be supplied when migration URI uses UNIX transport method"));
@@ -11060,7 +11050,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
cookieout, cookieoutlen, cookieout, cookieoutlen,
uri_in, uri_out, uri_in, uri_out,
&def, origname, listenAddress, &def, origname, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, migrate_disks, nbdPort,
nbdURI, migParams, flags); nbdURI, migParams, flags);
} }
@@ -11190,7 +11180,7 @@ qemuDomainMigratePerform3(virDomainPtr dom,
goto cleanup; goto cleanup;
ret = qemuMigrationSrcPerform(driver, dom->conn, vm, xmlin, NULL, ret = qemuMigrationSrcPerform(driver, dom->conn, vm, xmlin, NULL,
dconnuri, uri, NULL, NULL, 0, NULL, 0, dconnuri, uri, NULL, NULL, NULL, 0,
NULL, migParams, NULL, migParams,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
@@ -11220,7 +11210,6 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
const char *uri = NULL; const char *uri = NULL;
const char *graphicsuri = NULL; const char *graphicsuri = NULL;
const char *listenAddress = NULL; const char *listenAddress = NULL;
int nmigrate_disks;
g_autofree const char **migrate_disks = NULL; g_autofree const char **migrate_disks = NULL;
unsigned long long bandwidth = 0; unsigned long long bandwidth = 0;
int nbdPort = 0; int nbdPort = 0;
@@ -11276,15 +11265,11 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
} }
} }
nmigrate_disks = virTypedParamsGetStringList(params, nparams, virTypedParamsGetStringList(params, nparams, VIR_MIGRATE_PARAM_MIGRATE_DISKS,
VIR_MIGRATE_PARAM_MIGRATE_DISKS, &migrate_disks);
&migrate_disks);
if (nmigrate_disks < 0)
goto cleanup;
if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) || if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) ||
nmigrate_disks > 0) { migrate_disks) {
if (uri && STRPREFIX(uri, "unix:") && !nbdURI) { if (uri && STRPREFIX(uri, "unix:") && !nbdURI) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("NBD URI must be supplied when migration URI uses UNIX transport method")); _("NBD URI must be supplied when migration URI uses UNIX transport method"));
@@ -11304,7 +11289,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
ret = qemuMigrationSrcPerform(driver, dom->conn, vm, dom_xml, persist_xml, ret = qemuMigrationSrcPerform(driver, dom->conn, vm, dom_xml, persist_xml,
dconnuri, uri, graphicsuri, listenAddress, dconnuri, uri, graphicsuri, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, migrate_disks, nbdPort,
nbdURI, migParams, nbdURI, migParams,
cookiein, cookieinlen, cookieout, cookieoutlen, cookiein, cookieinlen, cookieout, cookieoutlen,
flags, dname, bandwidth, true); flags, dname, bandwidth, true);

105
src/qemu/qemu_migration.c
View File

@@ -382,7 +382,6 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn,
static bool static bool
qemuMigrationAnyCopyDisk(virDomainDiskDef const *disk, qemuMigrationAnyCopyDisk(virDomainDiskDef const *disk,
size_t nmigrate_disks G_GNUC_UNUSED,
const char **migrate_disks) const char **migrate_disks)
{ {
/* List of disks to migrate takes priority if present */ /* List of disks to migrate takes priority if present */
@@ -398,13 +397,12 @@ qemuMigrationAnyCopyDisk(virDomainDiskDef const *disk,
static bool static bool
qemuMigrationHasAnyStorageMigrationDisks(virDomainDef *def, qemuMigrationHasAnyStorageMigrationDisks(virDomainDef *def,
const char **migrate_disks, const char **migrate_disks)
size_t nmigrate_disks)
{ {
size_t i; size_t i;
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {
if (qemuMigrationAnyCopyDisk(def->disks[i], nmigrate_disks, migrate_disks)) if (qemuMigrationAnyCopyDisk(def->disks[i], migrate_disks))
return true; return true;
} }
@@ -415,7 +413,6 @@ qemuMigrationHasAnyStorageMigrationDisks(virDomainDef *def,
static int static int
qemuMigrationDstPrepareStorage(virDomainObj *vm, qemuMigrationDstPrepareStorage(virDomainObj *vm,
qemuMigrationCookieNBD *nbd, qemuMigrationCookieNBD *nbd,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
bool incremental) bool incremental)
{ {
@@ -440,7 +437,7 @@ qemuMigrationDstPrepareStorage(virDomainObj *vm,
} }
/* Skip disks we don't want to migrate. */ /* Skip disks we don't want to migrate. */
if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) if (!qemuMigrationAnyCopyDisk(disk, migrate_disks))
continue; continue;
switch (virStorageSourceGetActualType(disk->src)) { switch (virStorageSourceGetActualType(disk->src)) {
@@ -547,7 +544,6 @@ static int
qemuMigrationDstStartNBDServer(virQEMUDriver *driver, qemuMigrationDstStartNBDServer(virQEMUDriver *driver,
virDomainObj *vm, virDomainObj *vm,
const char *listenAddr, const char *listenAddr,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -614,7 +610,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver,
g_autofree char *diskAlias = NULL; g_autofree char *diskAlias = NULL;
/* check whether disk should be migrated */ /* check whether disk should be migrated */
if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) if (!qemuMigrationAnyCopyDisk(disk, migrate_disks))
continue; continue;
if (disk->src->readonly || virStorageSourceIsEmpty(disk->src)) { if (disk->src->readonly || virStorageSourceIsEmpty(disk->src)) {
@@ -1186,7 +1182,6 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver,
qemuMigrationCookie *mig, qemuMigrationCookie *mig,
const char *host, const char *host,
unsigned long speed, unsigned long speed,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
virConnectPtr dconn, virConnectPtr dconn,
const char *tlsAlias, const char *tlsAlias,
@@ -1261,7 +1256,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver,
virDomainDiskDef *disk = vm->def->disks[i]; virDomainDiskDef *disk = vm->def->disks[i];
/* check whether disk should be migrated */ /* check whether disk should be migrated */
if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) if (!qemuMigrationAnyCopyDisk(disk, migrate_disks))
continue; continue;
if (qemuMigrationSrcNBDStorageCopyOne(vm, disk, host, port, if (qemuMigrationSrcNBDStorageCopyOne(vm, disk, host, port,
@@ -1614,7 +1609,6 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm,
static bool static bool
qemuMigrationSrcIsSafe(virDomainDef *def, qemuMigrationSrcIsSafe(virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
unsigned int flags) unsigned int flags)
@@ -1638,7 +1632,7 @@ qemuMigrationSrcIsSafe(virDomainDef *def,
/* Disks which are migrated by qemu are safe too. */ /* Disks which are migrated by qemu are safe too. */
if (storagemigration && if (storagemigration &&
qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) qemuMigrationAnyCopyDisk(disk, migrate_disks))
continue; continue;
/* However, disks on local FS (e.g. ext4) are not safe. */ /* However, disks on local FS (e.g. ext4) are not safe. */
@@ -2437,8 +2431,7 @@ qemuMigrationAnyConnectionClosed(virDomainObj *vm,
static int static int
qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigrationCookie *mig, qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigrationCookie *mig,
virDomainObj *vm, virDomainObj *vm,
const char **migrate_disks, const char **migrate_disks)
size_t nmigrate_disks)
{ {
GSList *disks = NULL; GSList *disks = NULL;
@@ -2460,7 +2453,7 @@ qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigrationCookie *mig,
if (!nodedata) if (!nodedata)
continue; continue;
if (!qemuMigrationAnyCopyDisk(diskdef, nmigrate_disks, migrate_disks)) if (!qemuMigrationAnyCopyDisk(diskdef, migrate_disks))
continue; continue;
for (j = 0; j < nodedata->nbitmaps; j++) { for (j = 0; j < nodedata->nbitmaps; j++) {
@@ -2530,7 +2523,6 @@ qemuMigrationSrcBeginXML(virDomainObj *vm,
int *cookieoutlen, int *cookieoutlen,
unsigned int cookieFlags, unsigned int cookieFlags,
const char **migrate_disks, const char **migrate_disks,
size_t nmigrate_disks,
unsigned int flags) unsigned int flags)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
@@ -2548,8 +2540,7 @@ qemuMigrationSrcBeginXML(virDomainObj *vm,
if (cookieFlags & QEMU_MIGRATION_COOKIE_NBD && if (cookieFlags & QEMU_MIGRATION_COOKIE_NBD &&
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING) &&
qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(mig, vm, migrate_disks, qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(mig, vm, migrate_disks) < 0)
nmigrate_disks) < 0)
return NULL; return NULL;
if (qemuMigrationCookieFormat(mig, driver, vm, if (qemuMigrationCookieFormat(mig, driver, vm,
@@ -2615,7 +2606,6 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
const char *dname, const char *dname,
char **cookieout, char **cookieout,
int *cookieoutlen, int *cookieoutlen,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
unsigned int flags) unsigned int flags)
{ {
@@ -2641,8 +2631,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
return NULL; return NULL;
if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) &&
!qemuMigrationSrcIsSafe(vm->def, priv->qemuCaps, !qemuMigrationSrcIsSafe(vm->def, priv->qemuCaps, migrate_disks, flags))
nmigrate_disks, migrate_disks, flags))
return NULL; return NULL;
if (flags & VIR_MIGRATE_POSTCOPY && if (flags & VIR_MIGRATE_POSTCOPY &&
@@ -2697,9 +2686,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
priv->nbdPort = 0; priv->nbdPort = 0;
if (qemuMigrationHasAnyStorageMigrationDisks(vm->def, if (qemuMigrationHasAnyStorageMigrationDisks(vm->def, migrate_disks))
migrate_disks,
nmigrate_disks))
cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
} else { } else {
if (migrate_disks) { if (migrate_disks) {
@@ -2721,8 +2708,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
return qemuMigrationSrcBeginXML(vm, xmlin, return qemuMigrationSrcBeginXML(vm, xmlin,
cookieout, cookieoutlen, cookieFlags, cookieout, cookieoutlen, cookieFlags,
migrate_disks, nmigrate_disks, migrate_disks, flags);
flags);
} }
@@ -2812,7 +2798,7 @@ qemuMigrationSrcBeginResume(virDomainObj *vm,
} }
return qemuMigrationSrcBeginXML(vm, xmlin, return qemuMigrationSrcBeginXML(vm, xmlin,
cookieout, cookieoutlen, 0, NULL, 0, flags); cookieout, cookieoutlen, 0, NULL, flags);
} }
@@ -2857,7 +2843,6 @@ qemuMigrationSrcBegin(virConnectPtr conn,
const char *dname, const char *dname,
char **cookieout, char **cookieout,
int *cookieoutlen, int *cookieoutlen,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
unsigned int flags) unsigned int flags)
{ {
@@ -2908,7 +2893,7 @@ qemuMigrationSrcBegin(virConnectPtr conn,
if (!(xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname, if (!(xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname,
cookieout, cookieoutlen, cookieout, cookieoutlen,
nmigrate_disks, migrate_disks, flags))) migrate_disks, flags)))
goto endjob; goto endjob;
if ((flags & VIR_MIGRATE_CHANGE_PROTECTION)) { if ((flags & VIR_MIGRATE_CHANGE_PROTECTION)) {
@@ -3121,7 +3106,6 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
const char *protocol, const char *protocol,
unsigned short port, unsigned short port,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -3149,8 +3133,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
goto error; goto error;
} }
if (qemuMigrationDstPrepareStorage(vm, mig->nbd, if (qemuMigrationDstPrepareStorage(vm, mig->nbd, migrate_disks,
nmigrate_disks, migrate_disks,
!!(flags & VIR_MIGRATE_NON_SHARED_INC)) < 0) !!(flags & VIR_MIGRATE_NON_SHARED_INC)) < 0)
goto error; goto error;
@@ -3245,7 +3228,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
} }
if (qemuMigrationDstStartNBDServer(driver, vm, incoming->address, if (qemuMigrationDstStartNBDServer(driver, vm, incoming->address,
nmigrate_disks, migrate_disks, migrate_disks,
nbdPort, nbdURI, nbdPort, nbdURI,
nbdTLSAlias) < 0) { nbdTLSAlias) < 0) {
goto error; goto error;
@@ -3316,7 +3299,6 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
unsigned short port, unsigned short port,
bool autoPort, bool autoPort,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -3426,7 +3408,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
if (!(flags & VIR_MIGRATE_OFFLINE)) { if (!(flags & VIR_MIGRATE_OFFLINE)) {
if (qemuMigrationDstPrepareActive(driver, vm, dconn, mig, st, if (qemuMigrationDstPrepareActive(driver, vm, dconn, mig, st,
protocol, port, listenAddress, protocol, port, listenAddress,
nmigrate_disks, migrate_disks, migrate_disks,
nbdPort, nbdURI, nbdPort, nbdURI,
migParams, flags) < 0) { migParams, flags) < 0) {
goto stopjob; goto stopjob;
@@ -3589,7 +3571,6 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver,
unsigned short port, unsigned short port,
bool autoPort, bool autoPort,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -3652,7 +3633,7 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver,
cookieout, cookieoutlen, cookieout, cookieoutlen,
def, origname, st, protocol, def, origname, st, protocol,
port, autoPort, listenAddress, port, autoPort, listenAddress,
nmigrate_disks, migrate_disks, migrate_disks,
nbdPort, nbdURI, nbdPort, nbdURI,
migParams, flags); migParams, flags);
} }
@@ -3689,7 +3670,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriver *driver,
return qemuMigrationDstPrepareAny(driver, dconn, cookiein, cookieinlen, return qemuMigrationDstPrepareAny(driver, dconn, cookiein, cookieinlen,
cookieout, cookieoutlen, def, origname, cookieout, cookieoutlen, def, origname,
st, NULL, 0, false, NULL, 0, NULL, 0, st, NULL, 0, false, NULL, NULL, 0,
NULL, migParams, flags); NULL, migParams, flags);
} }
@@ -3728,7 +3709,6 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
virDomainDef **def, virDomainDef **def,
const char *origname, const char *origname,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -3859,7 +3839,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
cookieout, cookieoutlen, def, origname, cookieout, cookieoutlen, def, origname,
NULL, uri ? uri->scheme : "tcp", NULL, uri ? uri->scheme : "tcp",
port, autoPort, listenAddress, port, autoPort, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, migrate_disks, nbdPort,
nbdURI, migParams, flags); nbdURI, migParams, flags);
cleanup: cleanup:
if (ret != 0) { if (ret != 0) {
@@ -4759,7 +4739,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
qemuMigrationSpec *spec, qemuMigrationSpec *spec,
virConnectPtr dconn, virConnectPtr dconn,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationParams *migParams, qemuMigrationParams *migParams,
const char *nbdURI) const char *nbdURI)
@@ -4794,8 +4773,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
if (storageMigration) if (storageMigration)
storageMigration = qemuMigrationHasAnyStorageMigrationDisks(vm->def, storageMigration = qemuMigrationHasAnyStorageMigrationDisks(vm->def,
migrate_disks, migrate_disks);
nmigrate_disks);
if (storageMigration) { if (storageMigration) {
cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
@@ -4928,7 +4906,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
if (qemuMigrationSrcNBDStorageCopy(driver, vm, mig, if (qemuMigrationSrcNBDStorageCopy(driver, vm, mig,
host, host,
priv->migMaxBandwidth, priv->migMaxBandwidth,
nmigrate_disks,
migrate_disks, migrate_disks,
dconn, tlsAlias, tlsHostname, dconn, tlsAlias, tlsHostname,
nbdURI, flags) < 0) { nbdURI, flags) < 0) {
@@ -5198,7 +5175,6 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver,
unsigned long resource, unsigned long resource,
virConnectPtr dconn, virConnectPtr dconn,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationParams *migParams, qemuMigrationParams *migParams,
const char *nbdURI) const char *nbdURI)
@@ -5279,7 +5255,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver,
ret = qemuMigrationSrcRun(driver, vm, xmlin, persist_xml, cookiein, cookieinlen, ret = qemuMigrationSrcRun(driver, vm, xmlin, persist_xml, cookiein, cookieinlen,
cookieout, cookieoutlen, flags, resource, cookieout, cookieoutlen, flags, resource,
&spec, dconn, graphicsuri, &spec, dconn, graphicsuri,
nmigrate_disks, migrate_disks, migrate_disks,
migParams, nbdURI); migParams, nbdURI);
} }
@@ -5304,7 +5280,6 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver,
unsigned long resource, unsigned long resource,
virConnectPtr dconn, virConnectPtr dconn,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationParams *migParams) qemuMigrationParams *migParams)
{ {
@@ -5343,7 +5318,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver,
ret = qemuMigrationSrcRun(driver, vm, xmlin, persist_xml, cookiein, cookieinlen, ret = qemuMigrationSrcRun(driver, vm, xmlin, persist_xml, cookiein, cookieinlen,
cookieout, cookieoutlen, flags, resource, &spec, cookieout, cookieoutlen, flags, resource, &spec,
dconn, graphicsuri, nmigrate_disks, migrate_disks, dconn, graphicsuri, migrate_disks,
migParams, NULL); migParams, NULL);
cleanup: cleanup:
@@ -5383,7 +5358,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver,
ret = qemuMigrationSrcPerformNative(driver, vm, NULL, NULL, uri, ret = qemuMigrationSrcPerformNative(driver, vm, NULL, NULL, uri,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, flags, cookieout, cookieoutlen, flags,
0, NULL, NULL, 0, NULL, migParams, NULL); 0, NULL, NULL, NULL, migParams, NULL);
virCloseCallbacksDomainAdd(vm, conn, qemuMigrationAnyConnectionClosed); virCloseCallbacksDomainAdd(vm, conn, qemuMigrationAnyConnectionClosed);
@@ -5485,12 +5460,12 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver,
ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, NULL, ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, NULL,
NULL, 0, NULL, NULL, NULL, 0, NULL, NULL,
flags, resource, dconn, flags, resource, dconn,
NULL, 0, NULL, migParams); NULL, NULL, migParams);
else else
ret = qemuMigrationSrcPerformNative(driver, vm, NULL, NULL, uri_out, ret = qemuMigrationSrcPerformNative(driver, vm, NULL, NULL, uri_out,
cookie, cookielen, cookie, cookielen,
NULL, NULL, /* No out cookie with v2 migration */ NULL, NULL, /* No out cookie with v2 migration */
flags, resource, dconn, NULL, 0, NULL, flags, resource, dconn, NULL, NULL,
migParams, NULL); migParams, NULL);
/* Perform failed. Make sure Finish doesn't overwrite the error */ /* Perform failed. Make sure Finish doesn't overwrite the error */
@@ -5553,7 +5528,6 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
const char *uri, const char *uri,
const char *graphicsuri, const char *graphicsuri,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -5599,7 +5573,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
} else { } else {
dom_xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname, dom_xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname,
&cookieout, &cookieoutlen, &cookieout, &cookieoutlen,
nmigrate_disks, migrate_disks, flags); migrate_disks, flags);
} }
if (!dom_xml) if (!dom_xml)
goto cleanup; goto cleanup;
@@ -5750,14 +5724,14 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
cookiein, cookieinlen, cookiein, cookieinlen,
&cookieout, &cookieoutlen, &cookieout, &cookieoutlen,
flags, bandwidth, dconn, graphicsuri, flags, bandwidth, dconn, graphicsuri,
nmigrate_disks, migrate_disks, migrate_disks,
migParams); migParams);
} else { } else {
ret = qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_xml, uri, ret = qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_xml, uri,
cookiein, cookieinlen, cookiein, cookieinlen,
&cookieout, &cookieoutlen, &cookieout, &cookieoutlen,
flags, bandwidth, dconn, graphicsuri, flags, bandwidth, dconn, graphicsuri,
nmigrate_disks, migrate_disks, migrate_disks,
migParams, nbdURI); migParams, nbdURI);
} }
@@ -5930,7 +5904,6 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver,
const char *uri, const char *uri,
const char *graphicsuri, const char *graphicsuri,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -6056,7 +6029,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver,
if (*v3proto) { if (*v3proto) {
ret = qemuMigrationSrcPerformPeer2Peer3(driver, sconn, dconn, dconnuri, vm, xmlin, ret = qemuMigrationSrcPerformPeer2Peer3(driver, sconn, dconn, dconnuri, vm, xmlin,
persist_xml, dname, uri, graphicsuri, persist_xml, dname, uri, graphicsuri,
listenAddress, nmigrate_disks, migrate_disks, listenAddress, migrate_disks,
nbdPort, nbdURI, migParams, resource, nbdPort, nbdURI, migParams, resource,
!!useParams, flags); !!useParams, flags);
} else { } else {
@@ -6092,7 +6065,6 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
const char *uri, const char *uri,
const char *graphicsuri, const char *graphicsuri,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -6135,8 +6107,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
goto endjob; goto endjob;
if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) &&
!qemuMigrationSrcIsSafe(vm->def, priv->qemuCaps, !qemuMigrationSrcIsSafe(vm->def, priv->qemuCaps, migrate_disks, flags))
nmigrate_disks, migrate_disks, flags))
goto endjob; goto endjob;
qemuMigrationSrcStoreDomainState(vm); qemuMigrationSrcStoreDomainState(vm);
@@ -6145,7 +6116,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
ret = qemuMigrationSrcPerformPeer2Peer(driver, conn, vm, xmlin, persist_xml, ret = qemuMigrationSrcPerformPeer2Peer(driver, conn, vm, xmlin, persist_xml,
dconnuri, uri, graphicsuri, listenAddress, dconnuri, uri, graphicsuri, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, migrate_disks, nbdPort,
nbdURI, nbdURI,
migParams, flags, dname, resource, migParams, flags, dname, resource,
&v3proto); &v3proto);
@@ -6155,7 +6126,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
ret = qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_xml, uri, cookiein, cookieinlen, ret = qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_xml, uri, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
flags, resource, NULL, NULL, 0, NULL, flags, resource, NULL, NULL, NULL,
migParams, nbdURI); migParams, nbdURI);
} }
if (ret < 0) if (ret < 0)
@@ -6222,7 +6193,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
const char *persist_xml, const char *persist_xml,
const char *uri, const char *uri,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationParams *migParams, qemuMigrationParams *migParams,
const char *cookiein, const char *cookiein,
@@ -6259,7 +6229,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
if (qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_xml, uri, cookiein, cookieinlen, if (qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_xml, uri, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
flags, resource, NULL, graphicsuri, flags, resource, NULL, graphicsuri,
nmigrate_disks, migrate_disks, migParams, nbdURI) < 0) migrate_disks, migParams, nbdURI) < 0)
goto cleanup; goto cleanup;
virCloseCallbacksDomainAdd(vm, conn, qemuMigrationAnyConnectionClosed); virCloseCallbacksDomainAdd(vm, conn, qemuMigrationAnyConnectionClosed);
@@ -6300,7 +6270,6 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
const char *uri, const char *uri,
const char *graphicsuri, const char *graphicsuri,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -6345,7 +6314,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, dconnuri, uri, return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, dconnuri, uri,
graphicsuri, listenAddress, graphicsuri, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, migrate_disks, nbdPort,
nbdURI, migParams, nbdURI, migParams,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
@@ -6361,7 +6330,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
if (v3proto) { if (v3proto) {
return qemuMigrationSrcPerformPhase(driver, conn, vm, xmlin, persist_xml, uri, return qemuMigrationSrcPerformPhase(driver, conn, vm, xmlin, persist_xml, uri,
graphicsuri, graphicsuri,
nmigrate_disks, migrate_disks, migrate_disks,
migParams, migParams,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
@@ -6370,7 +6339,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, NULL, return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, NULL,
uri, graphicsuri, listenAddress, uri, graphicsuri, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, migrate_disks, nbdPort,
nbdURI, migParams, nbdURI, migParams,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, flags, cookieout, cookieoutlen, flags,

3
src/qemu/qemu_migration.h
View File

@@ -122,7 +122,6 @@ qemuMigrationSrcBegin(virConnectPtr conn,
const char *dname, const char *dname,
char **cookieout, char **cookieout,
int *cookieoutlen, int *cookieoutlen,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
unsigned int flags); unsigned int flags);
@@ -158,7 +157,6 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
virDomainDef **def, virDomainDef **def,
const char *origname, const char *origname,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,
@@ -175,7 +173,6 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
const char *uri, const char *uri,
const char *graphicsuri, const char *graphicsuri,
const char *listenAddress, const char *listenAddress,
size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
const char *nbdURI, const char *nbdURI,