Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 ebd1e3ff 编写于 作者: J Jiri Denemark
浏览文件
操作

qemu: Hide qemuMigrationParamsSetCompression 

There's no need to call this API explicitly in the migration code. We
can pass the compression parameters to qemuMigrationParamsFromFlags and
it can internally call qemuMigrationParamsSetCompression to apply them
to the qemuMigrationParams structure.
Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 4087d312
隐藏空白更改
内联 并排
Showing with 36 addition and 53 deletion
src/qemu/qemu_driver.c
浏览文件 @ ebd1e3ff
...@@ -12120,7 +12120,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, ...@@ -12120,7 +12120,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags,
QEMU_MIGRATION_DESTINATION))) QEMU_MIGRATION_DESTINATION, compression)))
goto cleanup; goto cleanup;
if (virLockManagerPluginUsesState(driver->lockManager)) { if (virLockManagerPluginUsesState(driver->lockManager)) {
...@@ -12138,7 +12138,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, ...@@ -12138,7 +12138,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn,
ret = qemuMigrationDstPrepareTunnel(driver, dconn, ret = qemuMigrationDstPrepareTunnel(driver, dconn,
NULL, 0, NULL, NULL, /* No cookies in v2 */ NULL, 0, NULL, NULL, /* No cookies in v2 */
st, &def, origname, compression, migParams, flags); st, &def, origname, migParams, flags);
cleanup: cleanup:
VIR_FREE(compression); VIR_FREE(compression);
...@@ -12186,7 +12186,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ...@@ -12186,7 +12186,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags,
QEMU_MIGRATION_DESTINATION))) QEMU_MIGRATION_DESTINATION, compression)))
goto cleanup; goto cleanup;
if (virLockManagerPluginUsesState(driver->lockManager)) { if (virLockManagerPluginUsesState(driver->lockManager)) {
...@@ -12210,7 +12210,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ...@@ -12210,7 +12210,7 @@ qemuDomainMigratePrepare2(virConnectPtr 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, &def, origname, NULL, 0, NULL, 0,
compression, migParams, flags); migParams, flags);
cleanup: cleanup:
qemuMigrationParamsFree(migParams); qemuMigrationParamsFree(migParams);
...@@ -12251,7 +12251,7 @@ qemuDomainMigratePerform(virDomainPtr dom, ...@@ -12251,7 +12251,7 @@ qemuDomainMigratePerform(virDomainPtr dom,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags,
QEMU_MIGRATION_SOURCE))) QEMU_MIGRATION_SOURCE, compression)))
goto cleanup; goto cleanup;
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
...@@ -12445,7 +12445,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, ...@@ -12445,7 +12445,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags,
QEMU_MIGRATION_DESTINATION))) QEMU_MIGRATION_DESTINATION, compression)))
goto cleanup; goto cleanup;
if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname)))
...@@ -12459,7 +12459,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, ...@@ -12459,7 +12459,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn,
cookieout, cookieoutlen, cookieout, cookieoutlen,
uri_in, uri_out, uri_in, uri_out,
&def, origname, NULL, 0, NULL, 0, &def, origname, NULL, 0, NULL, 0,
compression, migParams, flags); migParams, flags);
cleanup: cleanup:
qemuMigrationParamsFree(migParams); qemuMigrationParamsFree(migParams);
...@@ -12527,7 +12527,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, ...@@ -12527,7 +12527,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags, if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags,
QEMU_MIGRATION_DESTINATION))) QEMU_MIGRATION_DESTINATION, compression)))
goto cleanup; goto cleanup;
if (flags & VIR_MIGRATE_TUNNELLED) { if (flags & VIR_MIGRATE_TUNNELLED) {
...@@ -12552,7 +12552,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, ...@@ -12552,7 +12552,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn,
uri_in, uri_out, uri_in, uri_out,
&def, origname, listenAddress, &def, origname, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, nmigrate_disks, migrate_disks, nbdPort,
compression, migParams, flags); migParams, flags);
cleanup: cleanup:
qemuMigrationParamsFree(migParams); qemuMigrationParamsFree(migParams);
...@@ -12596,7 +12596,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, ...@@ -12596,7 +12596,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags,
QEMU_MIGRATION_DESTINATION))) QEMU_MIGRATION_DESTINATION, compression)))
goto cleanup; goto cleanup;
if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname)))
...@@ -12608,7 +12608,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, ...@@ -12608,7 +12608,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn,
ret = qemuMigrationDstPrepareTunnel(driver, dconn, ret = qemuMigrationDstPrepareTunnel(driver, dconn,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
st, &def, origname, compression, migParams, flags); st, &def, origname, migParams, flags);
cleanup: cleanup:
VIR_FREE(compression); VIR_FREE(compression);
...@@ -12660,7 +12660,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, ...@@ -12660,7 +12660,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags, if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags,
QEMU_MIGRATION_DESTINATION))) QEMU_MIGRATION_DESTINATION, compression)))
goto cleanup; goto cleanup;
if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname)))
...@@ -12672,7 +12672,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, ...@@ -12672,7 +12672,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn,
ret = qemuMigrationDstPrepareTunnel(driver, dconn, ret = qemuMigrationDstPrepareTunnel(driver, dconn,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
st, &def, origname, compression, migParams, flags); st, &def, origname, migParams, flags);
cleanup: cleanup:
VIR_FREE(compression); VIR_FREE(compression);
...@@ -12708,7 +12708,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, ...@@ -12708,7 +12708,7 @@ qemuDomainMigratePerform3(virDomainPtr dom,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags, if (!(migParams = qemuMigrationParamsFromFlags(NULL, 0, flags,
QEMU_MIGRATION_SOURCE))) QEMU_MIGRATION_SOURCE, compression)))
goto cleanup; goto cleanup;
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
...@@ -12800,7 +12800,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, ...@@ -12800,7 +12800,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
goto cleanup; goto cleanup;
if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags, if (!(migParams = qemuMigrationParamsFromFlags(params, nparams, flags,
QEMU_MIGRATION_SOURCE))) QEMU_MIGRATION_SOURCE, compression)))
goto cleanup; goto cleanup;
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
......
src/qemu/qemu_migration.c
浏览文件 @ ebd1e3ff
...@@ -2158,7 +2158,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, ...@@ -2158,7 +2158,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
size_t nmigrate_disks, size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams, qemuMigrationParamsPtr migParams,
unsigned long flags) unsigned long flags)
{ {
...@@ -2372,9 +2371,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, ...@@ -2372,9 +2371,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
dataFD[1] = -1; /* 'st' owns the FD now & will close it */ dataFD[1] = -1; /* 'st' owns the FD now & will close it */
} }
if (qemuMigrationParamsSetCompression(vm, compression, migParams) < 0)
goto stopjob;
if (STREQ_NULLABLE(protocol, "rdma") && if (STREQ_NULLABLE(protocol, "rdma") &&
virProcessSetMaxMemLock(vm->pid, vm->def->mem.hard_limit << 10) < 0) { virProcessSetMaxMemLock(vm->pid, vm->def->mem.hard_limit << 10) < 0) {
goto stopjob; goto stopjob;
...@@ -2526,7 +2522,6 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, ...@@ -2526,7 +2522,6 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver,
virStreamPtr st, virStreamPtr st,
virDomainDefPtr *def, virDomainDefPtr *def,
const char *origname, const char *origname,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams, qemuMigrationParamsPtr migParams,
unsigned long flags) unsigned long flags)
{ {
...@@ -2545,7 +2540,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, ...@@ -2545,7 +2540,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr 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, 0, NULL, 0,
compression, migParams, flags); migParams, flags);
} }
...@@ -2587,7 +2582,6 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, ...@@ -2587,7 +2582,6 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver,
size_t nmigrate_disks, size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams, qemuMigrationParamsPtr migParams,
unsigned long flags) unsigned long flags)
{ {
...@@ -2712,7 +2706,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, ...@@ -2712,7 +2706,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver,
NULL, uri ? uri->scheme : "tcp", NULL, uri ? uri->scheme : "tcp",
port, autoPort, listenAddress, port, autoPort, listenAddress,
nmigrate_disks, migrate_disks, nbdPort, nmigrate_disks, migrate_disks, nbdPort,
compression, migParams, flags); migParams, flags);
cleanup: cleanup:
virURIFree(uri); virURIFree(uri);
VIR_FREE(hostname); VIR_FREE(hostname);
...@@ -3239,7 +3233,6 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, ...@@ -3239,7 +3233,6 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks, size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams) qemuMigrationParamsPtr migParams)
{ {
int ret = -1; int ret = -1;
...@@ -3314,9 +3307,6 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, ...@@ -3314,9 +3307,6 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
if (qemuMigrationSrcGraphicsRelocate(driver, vm, mig, graphicsuri) < 0) if (qemuMigrationSrcGraphicsRelocate(driver, vm, mig, graphicsuri) < 0)
VIR_WARN("unable to provide data for graphics client relocation"); VIR_WARN("unable to provide data for graphics client relocation");
if (qemuMigrationParamsSetCompression(vm, compression, migParams) < 0)
goto error;
if (qemuMigrationParamsCheck(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, if (qemuMigrationParamsCheck(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
migParams) < 0) migParams) < 0)
goto error; goto error;
...@@ -3606,7 +3596,6 @@ qemuMigrationSrcPerformNative(virQEMUDriverPtr driver, ...@@ -3606,7 +3596,6 @@ qemuMigrationSrcPerformNative(virQEMUDriverPtr driver,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks, size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams) qemuMigrationParamsPtr migParams)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
...@@ -3658,7 +3647,7 @@ qemuMigrationSrcPerformNative(virQEMUDriverPtr driver, ...@@ -3658,7 +3647,7 @@ qemuMigrationSrcPerformNative(virQEMUDriverPtr driver,
ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen, cookieout, ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen, cookieout,
cookieoutlen, flags, resource, &spec, dconn, cookieoutlen, flags, resource, &spec, dconn,
graphicsuri, nmigrate_disks, migrate_disks, graphicsuri, nmigrate_disks, migrate_disks,
compression, migParams); migParams);
if (spec.destType == MIGRATION_DEST_FD) if (spec.destType == MIGRATION_DEST_FD)
VIR_FORCE_CLOSE(spec.dest.fd.qemu); VIR_FORCE_CLOSE(spec.dest.fd.qemu);
...@@ -3685,7 +3674,6 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver, ...@@ -3685,7 +3674,6 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks, size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams) qemuMigrationParamsPtr migParams)
{ {
int ret = -1; int ret = -1;
...@@ -3723,7 +3711,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver, ...@@ -3723,7 +3711,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver,
ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen, ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen,
cookieout, cookieoutlen, flags, resource, &spec, cookieout, cookieoutlen, flags, resource, &spec,
dconn, graphicsuri, nmigrate_disks, migrate_disks, dconn, graphicsuri, nmigrate_disks, migrate_disks,
compression, migParams); migParams);
cleanup: cleanup:
VIR_FORCE_CLOSE(spec.dest.fd.qemu); VIR_FORCE_CLOSE(spec.dest.fd.qemu);
...@@ -3747,7 +3735,6 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver, ...@@ -3747,7 +3735,6 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver,
unsigned long flags, unsigned long flags,
const char *dname, const char *dname,
unsigned long resource, unsigned long resource,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams) qemuMigrationParamsPtr migParams)
{ {
virDomainPtr ddomain = NULL; virDomainPtr ddomain = NULL;
...@@ -3832,13 +3819,13 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver, ...@@ -3832,13 +3819,13 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver,
ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL,
NULL, 0, NULL, NULL, NULL, 0, NULL, NULL,
flags, resource, dconn, flags, resource, dconn,
NULL, 0, NULL, compression, migParams); NULL, 0, NULL, migParams);
else else
ret = qemuMigrationSrcPerformNative(driver, vm, NULL, uri_out, ret = qemuMigrationSrcPerformNative(driver, vm, 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, 0, NULL,
compression, migParams); migParams);
/* Perform failed. Make sure Finish doesn't overwrite the error */ /* Perform failed. Make sure Finish doesn't overwrite the error */
if (ret < 0) if (ret < 0)
...@@ -4077,14 +4064,14 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, ...@@ -4077,14 +4064,14 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver,
cookiein, cookieinlen, cookiein, cookieinlen,
&cookieout, &cookieoutlen, &cookieout, &cookieoutlen,
flags, bandwidth, dconn, graphicsuri, flags, bandwidth, dconn, graphicsuri,
nmigrate_disks, migrate_disks, compression, nmigrate_disks, migrate_disks,
migParams); migParams);
} else { } else {
ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri,
cookiein, cookieinlen, cookiein, cookieinlen,
&cookieout, &cookieoutlen, &cookieout, &cookieoutlen,
flags, bandwidth, dconn, graphicsuri, flags, bandwidth, dconn, graphicsuri,
nmigrate_disks, migrate_disks, compression, nmigrate_disks, migrate_disks,
migParams); migParams);
} }
...@@ -4393,7 +4380,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver, ...@@ -4393,7 +4380,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver,
} else { } else {
ret = qemuMigrationSrcPerformPeer2Peer2(driver, sconn, dconn, vm, ret = qemuMigrationSrcPerformPeer2Peer2(driver, sconn, dconn, vm,
dconnuri, flags, dname, resource, dconnuri, flags, dname, resource,
compression, migParams); migParams);
} }
cleanup: cleanup:
...@@ -4475,7 +4462,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, ...@@ -4475,7 +4462,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver,
ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen, ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
flags, resource, NULL, NULL, 0, NULL, flags, resource, NULL, NULL, 0, NULL,
compression, migParams); migParams);
} }
if (ret < 0) if (ret < 0)
goto endjob; goto endjob;
...@@ -4544,7 +4531,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, ...@@ -4544,7 +4531,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver,
const char *graphicsuri, const char *graphicsuri,
size_t nmigrate_disks, size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams, qemuMigrationParamsPtr migParams,
const char *cookiein, const char *cookiein,
int cookieinlen, int cookieinlen,
...@@ -4572,7 +4558,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, ...@@ -4572,7 +4558,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver,
ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen, ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
flags, resource, NULL, graphicsuri, flags, resource, NULL, graphicsuri,
nmigrate_disks, migrate_disks, compression, migParams); nmigrate_disks, migrate_disks, migParams);
if (ret < 0) { if (ret < 0) {
if (qemuMigrationSrcRestoreDomainState(driver, vm)) { if (qemuMigrationSrcRestoreDomainState(driver, vm)) {
...@@ -4667,7 +4653,7 @@ qemuMigrationSrcPerform(virQEMUDriverPtr driver, ...@@ -4667,7 +4653,7 @@ qemuMigrationSrcPerform(virQEMUDriverPtr driver,
return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_xml, uri, return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_xml, uri,
graphicsuri, graphicsuri,
nmigrate_disks, migrate_disks, nmigrate_disks, migrate_disks,
compression, migParams, migParams,
cookiein, cookieinlen, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
flags, resource); flags, resource);
......
src/qemu/qemu_migration.h
浏览文件 @ ebd1e3ff
...@@ -129,7 +129,6 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, ...@@ -129,7 +129,6 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver,
virStreamPtr st, virStreamPtr st,
virDomainDefPtr *def, virDomainDefPtr *def,
const char *origname, const char *origname,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams, qemuMigrationParamsPtr migParams,
unsigned long flags); unsigned long flags);
...@@ -148,7 +147,6 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, ...@@ -148,7 +147,6 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver,
size_t nmigrate_disks, size_t nmigrate_disks,
const char **migrate_disks, const char **migrate_disks,
int nbdPort, int nbdPort,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams, qemuMigrationParamsPtr migParams,
unsigned long flags); unsigned long flags);
......
src/qemu/qemu_migration_params.c
浏览文件 @ ebd1e3ff
...@@ -137,9 +137,8 @@ qemuMigrationParamsFree(qemuMigrationParamsPtr migParams) ...@@ -137,9 +137,8 @@ qemuMigrationParamsFree(qemuMigrationParamsPtr migParams)
} while (0) } while (0)
int static int
qemuMigrationParamsSetCompression(virDomainObjPtr vm ATTRIBUTE_UNUSED, qemuMigrationParamsSetCompression(qemuMigrationCompressionPtr compression,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams) qemuMigrationParamsPtr migParams)
{ {
if (compression->methods & (1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE)) if (compression->methods & (1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE))
...@@ -170,7 +169,8 @@ qemuMigrationParamsPtr ...@@ -170,7 +169,8 @@ qemuMigrationParamsPtr
qemuMigrationParamsFromFlags(virTypedParameterPtr params, qemuMigrationParamsFromFlags(virTypedParameterPtr params,
int nparams, int nparams,
unsigned long flags, unsigned long flags,
qemuMigrationParty party) qemuMigrationParty party,
qemuMigrationCompressionPtr compression)
{ {
qemuMigrationParamsPtr migParams; qemuMigrationParamsPtr migParams;
size_t i; size_t i;
...@@ -204,6 +204,9 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr params, ...@@ -204,6 +204,9 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr params,
goto error; goto error;
} }
if (qemuMigrationParamsSetCompression(compression, migParams) < 0)
goto error;
return migParams; return migParams;
error: error:
......
src/qemu/qemu_migration_params.h
浏览文件 @ ebd1e3ff
...@@ -60,7 +60,8 @@ qemuMigrationParamsPtr ...@@ -60,7 +60,8 @@ qemuMigrationParamsPtr
qemuMigrationParamsFromFlags(virTypedParameterPtr params, qemuMigrationParamsFromFlags(virTypedParameterPtr params,
int nparams, int nparams,
unsigned long flags, unsigned long flags,
qemuMigrationParty party); qemuMigrationParty party,
qemuMigrationCompressionPtr compression);
qemuMigrationCompressionPtr qemuMigrationCompressionPtr
qemuMigrationAnyCompressionParse(virTypedParameterPtr params, qemuMigrationAnyCompressionParse(virTypedParameterPtr params,
...@@ -96,11 +97,6 @@ int ...@@ -96,11 +97,6 @@ int
qemuMigrationParamsDisableTLS(virDomainObjPtr vm, qemuMigrationParamsDisableTLS(virDomainObjPtr vm,
qemuMigrationParamsPtr migParams); qemuMigrationParamsPtr migParams);
int
qemuMigrationParamsSetCompression(virDomainObjPtr vm,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams);
int int
qemuMigrationParamsCheck(virQEMUDriverPtr driver, qemuMigrationParamsCheck(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或