External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: drop virCapsPtr param from APIs for saving domains

Browse Source 
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-11-27 12:53:10 +00:00
parent 24d87d2e88
commit 78d8228eec
15 changed files with 128 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bhyve/bhyve_driver.c
View File

@ -540,7 +540,7 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flag
vm->persistent = 1;
if (virDomainDefSave(vm->newDef ? vm->newDef : vm->def,
privconn->xmlopt, caps, BHYVE_CONFIG_DIR) < 0) {
privconn->xmlopt, BHYVE_CONFIG_DIR) < 0) {
virDomainObjListRemove(privconn->domains, vm);
goto cleanup;
}
@ -1063,7 +1063,6 @@ bhyveDomainSetMetadata(virDomainPtr dom,
{
bhyveConnPtr privconn = dom->conn->privateData;
virDomainObjPtr vm;
virCapsPtr caps = NULL;
int ret = -1;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@ -1075,10 +1074,7 @@ bhyveDomainSetMetadata(virDomainPtr dom,
if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup;
if (!(caps = bhyveDriverGetCapabilities(privconn)))
goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps,
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri,
privconn->xmlopt, BHYVE_STATE_DIR,
BHYVE_CONFIG_DIR, flags);
@ -1090,7 +1086,6 @@ bhyveDomainSetMetadata(virDomainPtr dom,
cleanup:
virObjectUnref(caps);
virDomainObjEndAPI(&vm);
return ret;
}

16
src/bhyve/bhyve_process.c
View File

@ -110,14 +110,9 @@ virBhyveProcessStart(virConnectPtr conn,
bhyveConnPtr privconn = conn->privateData;
bhyveDomainObjPrivatePtr priv = vm->privateData;
int ret = -1, rc;
virCapsPtr caps = NULL;
logfile = g_strdup_printf("%s/%s.log", BHYVE_LOG_DIR, vm->def->name);
caps = bhyveDriverGetCapabilities(privconn);
if (!caps)
goto cleanup;
if ((logfd = open(logfile, O_WRONLY | O_APPEND | O_CREAT,
S_IRUSR | S_IWUSR)) < 0) {
virReportSystemError(errno,
@ -211,14 +206,13 @@ virBhyveProcessStart(virConnectPtr conn,
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason);
priv->mon = bhyveMonitorOpen(vm, driver);
if (virDomainObjSave(vm, driver->xmlopt, caps,
if (virDomainObjSave(vm, driver->xmlopt,
BHYVE_STATE_DIR) < 0)
goto cleanup;
ret = 0;
cleanup:
virObjectUnref(caps);
if (devicemap != NULL) {
rc = unlink(devmap_file);
if (rc < 0 && errno != ENOENT)
@ -384,7 +378,6 @@ virBhyveProcessReconnect(virDomainObjPtr vm,
char *expected_proctitle = NULL;
bhyveDomainObjPrivatePtr priv = vm->privateData;
int ret = -1;
virCapsPtr caps = NULL;
if (!virDomainObjIsActive(vm))
return 0;
@ -392,10 +385,6 @@ virBhyveProcessReconnect(virDomainObjPtr vm,
if (!vm->pid)
return 0;
caps = bhyveDriverGetCapabilities(data->driver);
if (!caps)
return -1;
virObjectLock(vm);
kp = kvm_getprocs(data->kd, KERN_PROC_PID, vm->pid, &nprocs);
@ -429,11 +418,10 @@ virBhyveProcessReconnect(virDomainObjPtr vm,
vm->def->id = -1;
virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF,
VIR_DOMAIN_SHUTOFF_UNKNOWN);
ignore_value(virDomainObjSave(vm, data->driver->xmlopt, caps,
ignore_value(virDomainObjSave(vm, data->driver->xmlopt,
BHYVE_STATE_DIR));
}
virObjectUnref(caps);
virObjectUnlock(vm);
VIR_FREE(expected_proctitle);

7
src/conf/domain_conf.c
View File

@ -29035,7 +29035,6 @@ virDomainDefSaveXML(virDomainDefPtr def,
int
virDomainDefSave(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt,
virCapsPtr caps G_GNUC_UNUSED,
const char *configDir)
{
g_autofree char *xml = NULL;
@ -29049,7 +29048,6 @@ virDomainDefSave(virDomainDefPtr def,
int
virDomainObjSave(virDomainObjPtr obj,
virDomainXMLOptionPtr xmlopt,
virCapsPtr caps G_GNUC_UNUSED,
const char *statusDir)
{
unsigned int flags = (VIR_DOMAIN_DEF_FORMAT_SECURE |
@ -30141,7 +30139,6 @@ virDomainObjSetMetadata(virDomainObjPtr vm,
const char *metadata,
const char *key,
const char *uri,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
const char *stateDir,
const char *configDir,
@ -30160,7 +30157,7 @@ virDomainObjSetMetadata(virDomainObjPtr vm,
if (virDomainDefSetMetadata(def, type, metadata, key, uri) < 0)
return -1;
if (virDomainObjSave(vm, xmlopt, caps, stateDir) < 0)
if (virDomainObjSave(vm, xmlopt, stateDir) < 0)
return -1;
}
@ -30169,7 +30166,7 @@ virDomainObjSetMetadata(virDomainObjPtr vm,
uri) < 0)
return -1;
if (virDomainDefSave(persistentDef, xmlopt, caps, configDir) < 0)
if (virDomainDefSave(persistentDef, xmlopt, configDir) < 0)
return -1;
}

3
src/conf/domain_conf.h
View File

@ -3283,7 +3283,6 @@ virDomainRedirdevDefPtr virDomainRedirdevDefRemove(virDomainDefPtr def, size_t i
int virDomainDefSave(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt,
virCapsPtr caps,
const char *configDir)
G_GNUC_WARN_UNUSED_RESULT
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
@ -3291,7 +3290,6 @@ int virDomainDefSave(virDomainDefPtr def,
int virDomainObjSave(virDomainObjPtr obj,
virDomainXMLOptionPtr xmlopt,
virCapsPtr caps,
const char *statusDir)
G_GNUC_WARN_UNUSED_RESULT
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
@ -3541,7 +3539,6 @@ int virDomainObjSetMetadata(virDomainObjPtr vm,
const char *metadata,
const char *key,
const char *uri,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
const char *stateDir,
const char *configDir,

2
src/libxl/libxl_domain.c
View File

@ -1470,7 +1470,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER);
}
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto destroy_dom;
if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback)

34
src/libxl/libxl_driver.c
View File

@ -453,7 +453,7 @@ libxlReconnectDomain(virDomainObjPtr vm,
libxlReconnectNotifyNets(vm->def);
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Cannot update XML for running Xen guest %s", vm->def->name);
/* now that we know it's reconnected call the hook if present */
@ -1188,7 +1188,7 @@ libxlDomainSuspend(virDomainPtr dom)
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
}
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
ret = 0;
@ -1242,7 +1242,7 @@ libxlDomainResume(virDomainPtr dom)
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
}
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
ret = 0;
@ -1667,7 +1667,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
virDomainDefSetMemoryTotal(persistentDef, newmem);
if (persistentDef->mem.cur_balloon > newmem)
persistentDef->mem.cur_balloon = newmem;
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->caps, cfg->configDir);
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
goto endjob;
}
@ -1700,7 +1700,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
if (flags & VIR_DOMAIN_MEM_CONFIG) {
sa_assert(persistentDef);
persistentDef->mem.cur_balloon = newmem;
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->caps, cfg->configDir);
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
goto endjob;
}
}
@ -2351,13 +2351,13 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
ret = 0;
if (flags & VIR_DOMAIN_VCPU_LIVE) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after changing vcpus",
vm->def->name);
}
}
if (flags & VIR_DOMAIN_VCPU_CONFIG) {
if (virDomainDefSave(def, driver->xmlopt, cfg->caps, cfg->configDir) < 0) {
if (virDomainDefSave(def, driver->xmlopt, cfg->configDir) < 0) {
VIR_WARN("Unable to save configuration of vm %s after changing vcpus",
vm->def->name);
}
@ -2507,9 +2507,9 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu,
ret = 0;
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
ret = virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir);
ret = virDomainObjSave(vm, driver->xmlopt, cfg->stateDir);
} else if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
ret = virDomainDefSave(targetDef, driver->xmlopt, cfg->caps, cfg->configDir);
ret = virDomainDefSave(targetDef, driver->xmlopt, cfg->configDir);
}
endjob:
@ -2870,7 +2870,7 @@ libxlDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flag
vm->persistent = 1;
if (virDomainDefSave(vm->newDef ? vm->newDef : vm->def,
driver->xmlopt, cfg->caps, cfg->configDir) < 0) {
driver->xmlopt, cfg->configDir) < 0) {
virDomainObjListRemove(driver->domains, vm);
goto cleanup;
}
@ -4143,7 +4143,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
* update domain status forcibly because the domain status may be
* changed even if we attach the device failed.
*/
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
@ -4151,7 +4151,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->caps, cfg->configDir);
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
@ -4233,7 +4233,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
* update domain status forcibly because the domain status may be
* changed even if we attach the device failed.
*/
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
@ -4241,7 +4241,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->caps, cfg->configDir);
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
@ -4320,13 +4320,13 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
* update domain status forcibly because the domain status may be
* changed even if we attach the device failed.
*/
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
ret = -1;
}
/* Finally, if no error until here, we can save config. */
if (!ret && (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) {
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->caps, cfg->configDir);
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
@ -6526,7 +6526,7 @@ libxlDomainSetMetadata(virDomainPtr dom,
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, cfg->caps,
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri,
driver->xmlopt, cfg->stateDir,
cfg->configDir, flags);

6
src/libxl/libxl_migration.c
View File

@ -1324,7 +1324,7 @@ libxlDomainMigrationDstFinish(virConnectPtr dconn,
if (!(vmdef = virDomainObjGetPersistentDef(driver->xmlopt, vm, NULL)))
goto cleanup;
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->caps, cfg->configDir) < 0)
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0)
goto cleanup;
event = virDomainEventLifecycleNewFromObj(vm,
@ -1336,7 +1336,7 @@ libxlDomainMigrationDstFinish(virConnectPtr dconn,
event = NULL;
}
if (virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
dom = virGetDomain(dconn, vm->def->name, vm->def->uuid, vm->def->id);
@ -1386,7 +1386,7 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver,
VIR_DOMAIN_PAUSED_MIGRATION);
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED);
ignore_value(virDomainObjSave(vm, driver->xmlopt, cfg->caps, cfg->stateDir));
ignore_value(virDomainObjSave(vm, driver->xmlopt, cfg->stateDir));
}
goto cleanup;
}

39
src/lxc/lxc_driver.c
View File

@ -444,7 +444,7 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
vm->persistent = 1;
if (virDomainDefSave(vm->newDef ? vm->newDef : vm->def,
driver->xmlopt, driver->caps, cfg->configDir) < 0) {
driver->xmlopt, cfg->configDir) < 0) {
virDomainObjListRemove(driver->domains, vm);
goto cleanup;
}
@ -678,7 +678,7 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
if (persistentDef->mem.cur_balloon > newmem)
persistentDef->mem.cur_balloon = newmem;
if (virDomainDefSave(persistentDef,
driver->xmlopt, driver->caps, cfg->configDir) < 0)
driver->xmlopt, cfg->configDir) < 0)
goto endjob;
}
} else {
@ -705,14 +705,14 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
}
def->mem.cur_balloon = newmem;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
if (persistentDef) {
persistentDef->mem.cur_balloon = newmem;
if (virDomainDefSave(persistentDef,
driver->xmlopt, driver->caps, cfg->configDir) < 0)
driver->xmlopt, cfg->configDir) < 0)
goto endjob;
}
}
@ -857,11 +857,11 @@ lxcDomainSetMemoryParameters(virDomainPtr dom,
#undef VIR_SET_MEM_PARAMETER
if (def &&
virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
if (persistentDef &&
virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
goto endjob;
/* QEMU and LXC implementations are identical */
@ -1967,12 +1967,12 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom,
}
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
if (persistentDef) {
rc = virDomainDefSave(persistentDefCopy, driver->xmlopt, driver->caps,
rc = virDomainDefSave(persistentDefCopy, driver->xmlopt,
cfg->configDir);
if (rc < 0)
goto endjob;
@ -2673,7 +2673,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
}
}
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
ret = -1;
}
@ -3030,7 +3030,7 @@ static int lxcDomainSuspend(virDomainPtr dom)
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
ret = 0;
@ -3087,7 +3087,7 @@ static int lxcDomainResume(virDomainPtr dom)
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
ret = 0;
@ -4740,7 +4740,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom,
* changed even if we failed to attach the device. For example,
* a new controller may be created.
*/
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
ret = -1;
goto endjob;
}
@ -4748,7 +4748,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom,
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
ret = virDomainDefSave(vmdef, driver->xmlopt, driver->caps, cfg->configDir);
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
@ -4822,7 +4822,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom,
if (lxcDomainUpdateDeviceConfig(vmdef, dev) < 0)
goto endjob;
if (virDomainDefSave(vmdef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0)
goto endjob;
virDomainObjAssignDef(vm, vmdef, false, NULL);
@ -4908,7 +4908,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom,
* changed even if we failed to attach the device. For example,
* a new controller may be created.
*/
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
ret = -1;
goto endjob;
}
@ -4916,7 +4916,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom,
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
ret = virDomainDefSave(vmdef, driver->xmlopt, driver->caps, cfg->configDir);
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
@ -5207,7 +5207,6 @@ lxcDomainSetMetadata(virDomainPtr dom,
virLXCDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm;
virLXCDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
int ret = -1;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@ -5221,13 +5220,10 @@ lxcDomainSetMetadata(virDomainPtr dom,
if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup;
if (!(caps = virLXCDriverGetCapabilities(driver, false)))
goto cleanup;
if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0)
goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps,
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri,
driver->xmlopt, cfg->stateDir,
cfg->configDir, flags);
@ -5241,7 +5237,6 @@ lxcDomainSetMetadata(virDomainPtr dom,
cleanup:
virDomainObjEndAPI(&vm);
virObjectUnref(caps);
virObjectUnref(cfg);
return ret;
}

6
src/lxc/lxc_process.c
View File

@ -790,7 +790,7 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon G_GNUC_UNUSED,
}
virDomainAuditInit(vm, initpid, inode);
if (virDomainObjSave(vm, lxc_driver->xmlopt, lxc_driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, lxc_driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Cannot update XML with PID for LXC %s", vm->def->name);
virObjectUnlock(vm);
@ -1457,7 +1457,7 @@ int virLXCProcessStart(virConnectPtr conn,
/* Write domain status to disk for the controller to
* read when it starts */
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
/* Allow the child to exec the controller */
@ -1696,7 +1696,7 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm,
virLXCProcessReconnectNotifyNets(vm->def);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Cannot update XML for running LXC guest %s", vm->def->name);
/* now that we know it's reconnected call the hook if present */

6
src/qemu/qemu_domain.c
View File

@ -8188,7 +8188,7 @@ qemuDomainObjSaveStatus(virQEMUDriverPtr driver,
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
if (virDomainObjIsActive(obj)) {
if (virDomainObjSave(obj, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(obj, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Failed to save status on vm %s", obj->def->name);
}
@ -8220,7 +8220,7 @@ qemuDomainSaveConfig(virDomainObjPtr obj)
cfg = virQEMUDriverGetConfig(driver);
if (virDomainDefSave(def, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(def, driver->xmlopt, cfg->configDir) < 0)
VIR_WARN("Failed to save config of vm %s", obj->def->name);
}
@ -10082,7 +10082,7 @@ qemuDomainSetFakeReboot(virQEMUDriverPtr driver,
priv->fakeReboot = value;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Failed to save status on vm %s", vm->def->name);
cleanup:

110
src/qemu/qemu_driver.c
View File

@ -1865,7 +1865,7 @@ static int qemuDomainSuspend(virDomainPtr dom)
if (qemuProcessStopCPUs(driver, vm, reason, QEMU_ASYNC_JOB_NONE) < 0)
goto endjob;
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
ret = 0;
@ -1923,7 +1923,7 @@ static int qemuDomainResume(virDomainPtr dom)
goto endjob;
}
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
ret = 0;
@ -2365,7 +2365,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
if (persistentDef->mem.cur_balloon > newmem)
persistentDef->mem.cur_balloon = newmem;
ret = virDomainDefSave(persistentDef, driver->xmlopt, driver->caps,
ret = virDomainDefSave(persistentDef, driver->xmlopt,
cfg->configDir);
goto endjob;
}
@ -2405,7 +2405,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
if (persistentDef) {
persistentDef->mem.cur_balloon = newmem;
ret = virDomainDefSave(persistentDef, driver->xmlopt, driver->caps,
ret = virDomainDefSave(persistentDef, driver->xmlopt,
cfg->configDir);
goto endjob;
}
@ -2480,7 +2480,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period,
}
def->memballoon->period = period;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
@ -2492,7 +2492,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period,
goto endjob;
}
persistentDef->memballoon->period = period;
ret = virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir);
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
goto endjob;
}
@ -4202,7 +4202,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
virObjectEventStateQueue(driver->domainEventState, event);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after state change",
vm->def->name);
}
@ -4282,7 +4282,7 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver,
goto endjob;
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("unable to save domain status after removing device %s",
devAlias);
@ -4650,7 +4650,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver,
dev.data.chr->state = newstate;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("unable to save status of domain %s after updating state of "
"channel %s", vm->def->name, devAlias);
@ -4976,7 +4976,7 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver,
if (virDomainDefSetVcpusMax(persistentDef, nvcpus, driver->xmlopt) < 0)
return -1;
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
return -1;
return 0;
@ -5105,7 +5105,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
vcpuinfo->cpumask = tmpmap;
tmpmap = NULL;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
if (g_snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH,
@ -5188,7 +5188,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
vcpuinfo->cpumask = pcpumap;
pcpumap = NULL;
ret = virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir);
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
goto endjob;
}
@ -5320,7 +5320,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
if (!(def->cputune.emulatorpin = virBitmapNewCopy(pcpumap)))
goto endjob;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
str = virBitmapFormat(pcpumap);
@ -5340,7 +5340,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
if (!(persistentDef->cputune.emulatorpin = virBitmapNewCopy(pcpumap)))
goto endjob;
ret = virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir);
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
goto endjob;
}
@ -5800,7 +5800,7 @@ qemuDomainPinIOThread(virDomainPtr dom,
if (virProcessSetAffinity(iothrid->thread_id, pcpumap) < 0)
goto endjob;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
if (g_snprintf(paramField, VIR_TYPED_PARAM_FIELD_LENGTH,
@ -5833,7 +5833,7 @@ qemuDomainPinIOThread(virDomainPtr dom,
iothrid->cpumask = cpumask;
iothrid->autofill = false;
ret = virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir);
ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
goto endjob;
}
@ -6251,7 +6251,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
@ -6283,7 +6283,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
break;
}
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps,
if (virDomainDefSave(persistentDef, driver->xmlopt,
cfg->configDir) < 0)
goto endjob;
}
@ -6887,7 +6887,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
"%s", _("failed to resume domain"));
goto cleanup;
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Failed to save status on vm %s", vm->def->name);
goto cleanup;
}
@ -7594,7 +7594,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn,
vm->persistent = 1;
if (virDomainDefSave(vm->newDef ? vm->newDef : vm->def,
driver->xmlopt, driver->caps, cfg->configDir) < 0) {
driver->xmlopt, cfg->configDir) < 0) {
if (oldDef) {
/* There is backup so this VM was defined before.
* Just restore the backup. */
@ -8669,13 +8669,13 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr vm,
* changed even if we failed to attach the device. For example,
* a new controller may be created.
*/
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
}
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
if (virDomainDefSave(vmdef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0)
goto cleanup;
virDomainObjAssignDef(vm, vmdef, false, NULL);
@ -8822,7 +8822,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
* changed even if we failed to attach the device. For example,
* a new controller may be created.
*/
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
ret = -1;
goto endjob;
}
@ -8830,7 +8830,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
ret = virDomainDefSave(vmdef, driver->xmlopt, driver->caps, cfg->configDir);
ret = virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
@ -8920,13 +8920,13 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr driver,
* changed even if we failed to attach the device. For example,
* a new controller may be created.
*/
if (virDomainObjSave(vm, driver->xmlopt, caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
}
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
if (virDomainDefSave(vmdef, driver->xmlopt, caps, cfg->configDir) < 0)
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0)
goto cleanup;
virDomainObjAssignDef(vm, vmdef, false, NULL);
@ -9004,7 +9004,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver,
}
if (vmdef) {
if (virDomainDefSave(vmdef, driver->xmlopt, caps, cfg->configDir) < 0)
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0)
goto cleanup;
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
@ -9586,7 +9586,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
}
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
if (ret < 0)
@ -9621,7 +9621,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
}
}
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
ret = -1;
}
@ -9851,11 +9851,11 @@ qemuDomainSetMemoryParameters(virDomainPtr dom,
#undef VIR_SET_MEM_PARAMETER
if (def &&
virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
if (persistentDef &&
virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
goto endjob;
/* QEMU and LXC implementations are identical */
@ -10118,7 +10118,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
-1, mode, nodeset) < 0)
goto endjob;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
@ -10129,7 +10129,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
-1, mode, nodeset) < 0)
goto endjob;
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
goto endjob;
}
@ -10311,7 +10311,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO;
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
@ -10325,7 +10325,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO;
}
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
goto endjob;
}
@ -10523,7 +10523,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
int ret = -1;
int rc;
g_autoptr(virQEMUDriverConfig) cfg = NULL;
g_autoptr(virCaps) caps = NULL;
qemuDomainObjPrivatePtr priv;
virObjectEventPtr event = NULL;
virTypedParameterPtr eventParams = NULL;
@ -10569,9 +10568,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
goto cleanup;
}
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
@ -10787,7 +10783,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
}
}
if (virDomainObjSave(vm, driver->xmlopt, caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
if (eventNparams) {
@ -10797,7 +10793,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
}
if (persistentDef) {
rc = virDomainDefSave(persistentDefCopy, driver->xmlopt, caps,
rc = virDomainDefSave(persistentDefCopy, driver->xmlopt,
cfg->configDir);
if (rc < 0)
goto endjob;
@ -11636,7 +11632,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
goto endjob;
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
@ -11661,7 +11657,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
}
}
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
goto endjob;
}
@ -14654,7 +14650,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver,
defdisk->src = g_steal_pointer(&newsrc);
}
if (virDomainDefSave(vm->def, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(vm->def, driver->xmlopt, cfg->configDir) < 0)
goto cleanup;
ret = 0;
@ -15591,8 +15587,8 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
if (rc < 0)
goto cleanup;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0 ||
(vm->newDef && virDomainDefSave(vm->newDef, driver->xmlopt, driver->caps,
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0 ||
(vm->newDef && virDomainDefSave(vm->newDef, driver->xmlopt,
cfg->configDir) < 0))
goto cleanup;
@ -16886,7 +16882,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
}
if (ret == 0 && defined && vm->persistent &&
!(ret = virDomainDefSave(vm->newDef ? vm->newDef : vm->def,
driver->xmlopt, driver->caps, cfg->configDir))) {
driver->xmlopt, cfg->configDir))) {
detail = VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT;
virObjectEventStateQueue(driver->domainEventState,
virDomainEventLifecycleNewFromObj(vm,
@ -17691,7 +17687,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
job->state = QEMU_BLOCKJOB_STATE_ABORTING;
}
ignore_value(virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir));
ignore_value(virDomainObjSave(vm, driver->xmlopt, cfg->stateDir));
if (!async) {
qemuBlockJobUpdate(vm, job, QEMU_ASYNC_JOB_NONE);
@ -19269,7 +19265,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
if (virDomainDiskSetBlockIOTune(disk, &info) < 0)
goto endjob;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
if (eventNparams) {
@ -19294,7 +19290,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
if (virDomainDiskSetBlockIOTune(conf_disk, &info) < 0)
goto endjob;
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps,
if (virDomainDefSave(persistentDef, driver->xmlopt,
cfg->configDir) < 0)
goto endjob;
}
@ -19555,7 +19551,6 @@ qemuDomainSetMetadata(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm;
g_autoptr(virQEMUDriverConfig) cfg = NULL;
g_autoptr(virCaps) caps = NULL;
int ret = -1;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@ -19569,13 +19564,10 @@ qemuDomainSetMetadata(virDomainPtr dom,
if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps,
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri,
driver->xmlopt, cfg->stateDir,
cfg->configDir, flags);
@ -21896,7 +21888,7 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
vm->def->name = new_dom_name;
new_dom_name = NULL;
if (virDomainDefSave(vm->def, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(vm->def, driver->xmlopt, cfg->configDir) < 0)
goto rollback;
if (virFileExists(old_dom_cfg_file) &&
@ -22420,14 +22412,14 @@ qemuDomainSetLifecycleAction(virDomainPtr dom,
qemuDomainModifyLifecycleAction(def, type, action);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto endjob;
}
if (persistentDef) {
qemuDomainModifyLifecycleAction(persistentDef, type, action);
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps,
if (virDomainDefSave(persistentDef, driver->xmlopt,
cfg->configDir) < 0)
goto endjob;
}
@ -22723,7 +22715,7 @@ qemuDomainAgentSetResponseTimeout(virDomainPtr dom,
QEMU_DOMAIN_PRIVATE(vm)->agentTimeout = timeout;
if (virDomainObjIsActive(vm) &&
virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
ret = 0;

8
src/qemu/qemu_hotplug.c
View File

@ -5980,7 +5980,7 @@ qemuDomainHotplugDelVcpu(virQEMUDriverPtr driver,
qemuDomainVcpuPersistOrder(vm->def);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
ret = 0;
@ -6055,7 +6055,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver,
qemuDomainVcpuPersistOrder(vm->def);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
ret = 0;
@ -6313,7 +6313,7 @@ qemuDomainSetVcpusInternal(virQEMUDriverPtr driver,
if (persistentDef) {
qemuDomainSetVcpusConfig(persistentDef, nvcpus, hotpluggable);
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
goto cleanup;
}
@ -6513,7 +6513,7 @@ qemuDomainSetVcpuInternal(virQEMUDriverPtr driver,
if (persistentDef) {
qemuDomainSetVcpuConfig(persistentDef, map, state);
if (virDomainDefSave(persistentDef, driver->xmlopt, driver->caps, cfg->configDir) < 0)
if (virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir) < 0)
goto cleanup;
}

8
src/qemu/qemu_migration.c
View File

@ -1037,7 +1037,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver,
tlsAlias, flags) < 0)
return -1;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Failed to save status on vm %s", vm->def->name);
return -1;
}
@ -3005,7 +3005,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver,
qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
priv->job.migParams, priv->job.apiFlags);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Failed to save status on vm %s", vm->def->name);
}
@ -4856,7 +4856,7 @@ qemuMigrationDstPersist(virQEMUDriverPtr driver,
priv->qemuCaps)))
goto error;
if (virDomainDefSave(vmdef, driver->xmlopt, driver->caps, cfg->configDir) < 0 &&
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0 &&
!ignoreSaveError)
goto error;
@ -5109,7 +5109,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver,
}
if (virDomainObjIsActive(vm) &&
virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Failed to save status on vm %s", vm->def->name);
/* Guest is successfully running, so cancel previous auto destroy */

36
src/qemu/qemu_process.c
View File

@ -411,7 +411,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED,
if (priv->agent)
qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Failed to save status on vm %s", vm->def->name);
if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY ||
@ -493,7 +493,7 @@ qemuProcessFakeReboot(void *opaque)
goto endjob;
}
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after state change",
vm->def->name);
}
@ -614,7 +614,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_DOMAIN_EVENT_SHUTDOWN,
detail);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after state change",
vm->def->name);
}
@ -680,7 +680,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_WARN("Unable to release lease on %s", vm->def->name);
VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState));
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after state change",
vm->def->name);
}
@ -726,7 +726,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_DOMAIN_EVENT_RESUMED,
eventDetail);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after state change",
vm->def->name);
}
@ -769,7 +769,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UNUSED,
offset += vm->def->clock.data.variable.adjustment0;
vm->def->clock.data.variable.adjustment = offset;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("unable to save domain status with RTC change");
}
@ -812,7 +812,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_WARN("Unable to release lease on %s", vm->def->name);
VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState));
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after watchdog event",
vm->def->name);
}
@ -904,7 +904,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_WARN("Unable to release lease on %s", vm->def->name);
VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState));
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("Unable to save status on vm %s after IO error", vm->def->name);
}
virObjectUnlock(vm);
@ -1149,7 +1149,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC_UNUSED,
else if (reason == VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE)
disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after tray moved event",
vm->def->name);
}
@ -1189,7 +1189,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_WAKEUP);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after wakeup event",
vm->def->name);
}
@ -1227,7 +1227,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_DOMAIN_EVENT_PMSUSPENDED,
VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after suspend event",
vm->def->name);
}
@ -1261,7 +1261,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_GNUC_UNUSED,
vm->def->mem.cur_balloon, actual);
vm->def->mem.cur_balloon = actual;
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
VIR_WARN("unable to save domain status with balloon change");
virObjectUnlock(vm);
@ -1296,7 +1296,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_DOMAIN_EVENT_PMSUSPENDED,
VIR_DOMAIN_EVENT_PMSUSPENDED_DISK);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after suspend event",
vm->def->name);
}
@ -1669,7 +1669,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED,
VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY);
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0) {
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
VIR_WARN("Unable to save status on vm %s after state change",
vm->def->name);
}
@ -3105,7 +3105,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver,
return -1;
cfg = virQEMUDriverGetConfig(driver);
ret = virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir);
ret = virDomainObjSave(vm, driver->xmlopt, cfg->stateDir);
virObjectUnref(cfg);
return ret;
@ -6860,7 +6860,7 @@ qemuProcessLaunch(virConnectPtr conn,
}
VIR_DEBUG("Writing early domain status to disk");
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
VIR_DEBUG("Waiting for handshake from child");
@ -7118,7 +7118,7 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver,
}
VIR_DEBUG("Writing domain status to disk");
if (virDomainObjSave(vm, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto cleanup;
if (qemuProcessStartHook(driver, vm,
@ -8223,7 +8223,7 @@ qemuProcessReconnect(void *opaque)
}
/* update domain state XML with possibly updated state in virDomainObj */
if (virDomainObjSave(obj, driver->xmlopt, driver->caps, cfg->stateDir) < 0)
if (virDomainObjSave(obj, driver->xmlopt, cfg->stateDir) < 0)
goto error;
/* Run an hook to allow admins to do some magic */

2
src/test/test_driver.c
View File

@ -4066,7 +4066,7 @@ static int testDomainSetMetadata(virDomainPtr dom,
return -1;
ret = virDomainObjSetMetadata(privdom, type, metadata, key, uri,
privconn->caps, privconn->xmlopt,
privconn->xmlopt,
NULL, NULL, flags);
if (ret == 0) {