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

migration: refactor: refactor parameter compatibility checks

Browse Source 
Move virDomainMigrateUnmanagedProto* expected params list check into
function itself and use common virTypedParamsCheck for this purpose.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2015-10-02 10:52:49 +03:00 committed by Jiri Denemark
parent 813355e256
commit dce0162b9a
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/libvirt-domain.c
View File

@ -3322,30 +3322,32 @@ virDomainMigrateUnmanagedProto2(virDomainPtr domain,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {
/* uri parameter is added for direct case */
const char *compatParams[] = { VIR_MIGRATE_PARAM_DEST_NAME,
VIR_MIGRATE_PARAM_BANDWIDTH,
VIR_MIGRATE_PARAM_URI };
const char *uri = NULL; const char *uri = NULL;
const char *miguri = NULL; const char *miguri = NULL;
const char *dname = NULL; const char *dname = NULL;
const char *xmlin = NULL;
unsigned long long bandwidth = 0; unsigned long long bandwidth = 0;
if (!virTypedParamsCheck(params, nparams, compatParams,
ARRAY_CARDINALITY(compatParams))) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Some parameters are not supported by migration "
"protocol 2"));
return -1;
}
if (virTypedParamsGetString(params, nparams, if (virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI, &miguri) < 0 || VIR_MIGRATE_PARAM_URI, &miguri) < 0 ||
virTypedParamsGetString(params, nparams, virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 ||
virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_XML, &xmlin) < 0 ||
virTypedParamsGetULLong(params, nparams, virTypedParamsGetULLong(params, nparams,
VIR_MIGRATE_PARAM_BANDWIDTH, &bandwidth) < 0) { VIR_MIGRATE_PARAM_BANDWIDTH, &bandwidth) < 0) {
return -1; return -1;
} }
if (xmlin) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Unable to change target guest XML during "
"migration"));
return -1;
}
if (flags & VIR_MIGRATE_PEER2PEER) { if (flags & VIR_MIGRATE_PEER2PEER) {
if (miguri) { if (miguri) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -3369,11 +3371,23 @@ virDomainMigrateUnmanagedProto3(virDomainPtr domain,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {
const char *compatParams[] = { VIR_MIGRATE_PARAM_URI,
VIR_MIGRATE_PARAM_DEST_NAME,
VIR_MIGRATE_PARAM_DEST_XML,
VIR_MIGRATE_PARAM_BANDWIDTH };
const char *miguri = NULL; const char *miguri = NULL;
const char *dname = NULL; const char *dname = NULL;
const char *xmlin = NULL; const char *xmlin = NULL;
unsigned long long bandwidth = 0; unsigned long long bandwidth = 0;
if (!virTypedParamsCheck(params, nparams, compatParams,
ARRAY_CARDINALITY(compatParams))) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Some parameters are not supported by migration "
"protocol 3"));
return -1;
}
if (virTypedParamsGetString(params, nparams, if (virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI, &miguri) < 0 || VIR_MIGRATE_PARAM_URI, &miguri) < 0 ||
virTypedParamsGetString(params, nparams, virTypedParamsGetString(params, nparams,
@ -4468,12 +4482,6 @@ virDomainMigrateToURI3(virDomainPtr domain,
unsigned int nparams, unsigned int nparams,
unsigned int flags) unsigned int flags)
{ {
bool compat;
const char *compatParams[] = { VIR_MIGRATE_PARAM_URI,
VIR_MIGRATE_PARAM_DEST_NAME,
VIR_MIGRATE_PARAM_DEST_XML,
VIR_MIGRATE_PARAM_BANDWIDTH };
VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparms=%u flags=%x", VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparms=%u flags=%x",
NULLSTR(dconnuri), params, nparams, flags); NULLSTR(dconnuri), params, nparams, flags);
VIR_TYPED_PARAMS_DEBUG(params, nparams); VIR_TYPED_PARAMS_DEBUG(params, nparams);
@ -4488,9 +4496,6 @@ virDomainMigrateToURI3(virDomainPtr domain,
VIR_MIGRATE_NON_SHARED_INC, VIR_MIGRATE_NON_SHARED_INC,
error); error);
compat = virTypedParamsCheck(params, nparams, compatParams,
ARRAY_CARDINALITY(compatParams));
if (flags & VIR_MIGRATE_PEER2PEER) { if (flags & VIR_MIGRATE_PEER2PEER) {
if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
VIR_DRV_FEATURE_MIGRATION_P2P)) { VIR_DRV_FEATURE_MIGRATION_P2P)) {
@ -4506,17 +4511,11 @@ virDomainMigrateToURI3(virDomainPtr domain,
if (virDomainMigratePeer2PeerParams(domain, dconnuri, params, if (virDomainMigratePeer2PeerParams(domain, dconnuri, params,
nparams, flags) < 0) nparams, flags) < 0)
goto error; goto error;
} else if (compat) { } else {
VIR_DEBUG("Using peer2peer migration"); VIR_DEBUG("Using peer2peer migration");
if (virDomainMigrateUnmanagedParams(domain, dconnuri, params, if (virDomainMigrateUnmanagedParams(domain, dconnuri, params,
nparams, flags) < 0) nparams, flags) < 0)
goto error; goto error;
} else {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Peer-to-peer migration with extensible "
"parameters is not supported but extended "
"parameters were passed"));
goto error;
} }
} else { } else {
if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn,
@ -4528,13 +4527,6 @@ virDomainMigrateToURI3(virDomainPtr domain,
goto error; goto error;
} }
if (!compat) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Direct migration does not support extensible "
"parameters"));
goto error;
}
VIR_DEBUG("Using direct migration"); VIR_DEBUG("Using direct migration");
if (virDomainMigrateUnmanagedParams(domain, NULL, params, if (virDomainMigrateUnmanagedParams(domain, NULL, params,
nparams, flags) < 0) nparams, flags) < 0)