mirror of https://gitee.com/openkylin/libvirt.git
conf: Isolate virDomainLiveConfigHelperMethod to libxl only
Libxl is the last user and I don't have the toolchain prepared to compile the libxl driver. Move it to the libxl driver to avoid having to refactor the code.
This commit is contained in:
parent
ef88140725
commit
f3d3be3d48
|
@ -2983,35 +2983,6 @@ virDomainObjUpdateModificationImpact(virDomainObjPtr vm,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Helper method for --current, --live, and --config options, and check
|
|
||||||
* whether domain is active or can get persistent domain configuration.
|
|
||||||
*
|
|
||||||
* Return 0 if success, also change the flags and get the persistent
|
|
||||||
* domain configuration if needed. Return -1 on error.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
virDomainLiveConfigHelperMethod(virCapsPtr caps,
|
|
||||||
virDomainXMLOptionPtr xmlopt,
|
|
||||||
virDomainObjPtr dom,
|
|
||||||
unsigned int *flags,
|
|
||||||
virDomainDefPtr *persistentDef)
|
|
||||||
{
|
|
||||||
if (virDomainObjUpdateModificationImpact(dom, flags) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (*flags & VIR_DOMAIN_AFFECT_CONFIG) {
|
|
||||||
if (!(*persistentDef = virDomainObjGetPersistentDef(caps, xmlopt, dom))) {
|
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
||||||
_("Get persistent config failed"));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* virDomainObjGetDefs:
|
* virDomainObjGetDefs:
|
||||||
*
|
*
|
||||||
|
|
|
@ -2557,13 +2557,6 @@ int virDomainObjGetDefs(virDomainObjPtr vm,
|
||||||
virDomainDefPtr *persDef);
|
virDomainDefPtr *persDef);
|
||||||
virDomainDefPtr virDomainObjGetOneDef(virDomainObjPtr vm, unsigned int flags);
|
virDomainDefPtr virDomainObjGetOneDef(virDomainObjPtr vm, unsigned int flags);
|
||||||
|
|
||||||
int
|
|
||||||
virDomainLiveConfigHelperMethod(virCapsPtr caps,
|
|
||||||
virDomainXMLOptionPtr xmlopt,
|
|
||||||
virDomainObjPtr dom,
|
|
||||||
unsigned int *flags,
|
|
||||||
virDomainDefPtr *persistentDef);
|
|
||||||
|
|
||||||
virDomainDefPtr virDomainDefCopy(virDomainDefPtr src,
|
virDomainDefPtr virDomainDefCopy(virDomainDefPtr src,
|
||||||
virCapsPtr caps,
|
virCapsPtr caps,
|
||||||
virDomainXMLOptionPtr xmlopt,
|
virDomainXMLOptionPtr xmlopt,
|
||||||
|
|
|
@ -358,7 +358,6 @@ virDomainLifecycleCrashTypeFromString;
|
||||||
virDomainLifecycleCrashTypeToString;
|
virDomainLifecycleCrashTypeToString;
|
||||||
virDomainLifecycleTypeFromString;
|
virDomainLifecycleTypeFromString;
|
||||||
virDomainLifecycleTypeToString;
|
virDomainLifecycleTypeToString;
|
||||||
virDomainLiveConfigHelperMethod;
|
|
||||||
virDomainLoaderDefFree;
|
virDomainLoaderDefFree;
|
||||||
virDomainLoaderTypeFromString;
|
virDomainLoaderTypeFromString;
|
||||||
virDomainLoaderTypeToString;
|
virDomainLoaderTypeToString;
|
||||||
|
|
|
@ -1431,6 +1431,36 @@ libxlDomainGetMaxMemory(virDomainPtr dom)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Helper method for --current, --live, and --config options, and check
|
||||||
|
* whether domain is active or can get persistent domain configuration.
|
||||||
|
*
|
||||||
|
* Return 0 if success, also change the flags and get the persistent
|
||||||
|
* domain configuration if needed. Return -1 on error.
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
virDomainLiveConfigHelperMethod(virCapsPtr caps,
|
||||||
|
virDomainXMLOptionPtr xmlopt,
|
||||||
|
virDomainObjPtr dom,
|
||||||
|
unsigned int *flags,
|
||||||
|
virDomainDefPtr *persistentDef)
|
||||||
|
{
|
||||||
|
if (virDomainObjUpdateModificationImpact(dom, flags) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (*flags & VIR_DOMAIN_AFFECT_CONFIG) {
|
||||||
|
if (!(*persistentDef = virDomainObjGetPersistentDef(caps, xmlopt, dom))) {
|
||||||
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||||
|
_("Get persistent config failed"));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
|
libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
|
|
Loading…
Reference in New Issue