def = NULL;
vm->persistent = 1;
- if (virDomainSaveConfig(BHYVE_CONFIG_DIR,
+ if (virDomainSaveConfig(BHYVE_CONFIG_DIR, caps,
vm->newDef ? vm->newDef : vm->def) < 0) {
virDomainObjListRemove(privconn->domains, vm);
vm = NULL;
int
virDomainSaveConfig(const char *configDir,
+ virCapsPtr caps,
virDomainDefPtr def)
{
int ret = -1;
char *xml;
- if (!(xml = virDomainDefFormat(def, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE)))
+ if (!(xml = virDomainDefFormat(def, caps, VIR_DOMAIN_DEF_FORMAT_SECURE)))
goto cleanup;
if (virDomainSaveXML(configDir, def, xml))
uri) < 0)
return -1;
- if (virDomainSaveConfig(configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(configDir, caps, persistentDef) < 0)
return -1;
}
const char *xml);
int virDomainSaveConfig(const char *configDir,
+ virCapsPtr caps,
virDomainDefPtr def);
int virDomainSaveStatus(virDomainXMLOptionPtr xmlopt,
const char *statusDir,
virDomainDefSetMemoryTotal(persistentDef, newmem);
if (persistentDef->mem.cur_balloon > newmem)
persistentDef->mem.cur_balloon = newmem;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, cfg->caps, persistentDef);
goto endjob;
}
if (flags & VIR_DOMAIN_MEM_CONFIG) {
sa_assert(persistentDef);
persistentDef->mem.cur_balloon = newmem;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, cfg->caps, persistentDef);
goto endjob;
}
}
}
}
if (flags & VIR_DOMAIN_VCPU_CONFIG) {
- if (virDomainSaveConfig(cfg->configDir, def) < 0) {
+ if (virDomainSaveConfig(cfg->configDir, cfg->caps, def) < 0) {
VIR_WARN("Unable to save configuration of vm %s after changing vcpus",
vm->def->name);
}
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm);
} else if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, targetDef);
+ ret = virDomainSaveConfig(cfg->configDir, cfg->caps, targetDef);
}
endjob:
vm->persistent = 1;
if (virDomainSaveConfig(cfg->configDir,
+ cfg->caps,
vm->newDef ? vm->newDef : vm->def) < 0) {
virDomainObjListRemove(driver->domains, vm);
vm = NULL;
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
/* Finally, if no error until here, we can save config. */
if (!ret && (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
def = NULL;
vm->persistent = 1;
- if (virDomainSaveConfig(cfg->configDir,
+ if (virDomainSaveConfig(cfg->configDir, driver->caps,
vm->newDef ? vm->newDef : vm->def) < 0) {
virDomainObjListRemove(driver->domains, vm);
vm = NULL;
virDomainDefSetMemoryTotal(persistentDef, newmem);
if (persistentDef->mem.cur_balloon > newmem)
persistentDef->mem.cur_balloon = newmem;
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps,
+ persistentDef) < 0)
goto cleanup;
}
} else {
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
persistentDef->mem.cur_balloon = newmem;
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps,
+ persistentDef) < 0)
goto cleanup;
}
}
#undef LXC_SET_MEM_PARAMETER
if (flags & VIR_DOMAIN_AFFECT_CONFIG &&
- virDomainSaveConfig(cfg->configDir, vmdef) < 0)
+ virDomainSaveConfig(cfg->configDir, driver->caps, vmdef) < 0)
goto cleanup;
ret = 0;
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- rc = virDomainSaveConfig(cfg->configDir, vmdef);
+ rc = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (rc < 0)
goto cleanup;
}
}
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0)
ret = -1;
}
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
VIR_WARN("Unable to save status on vm %s after block job",
vm->def->name);
if (persistDisk && virDomainSaveConfig(cfg->configDir,
+ driver->caps,
vm->newDef) < 0)
VIR_WARN("Unable to update persistent definition on vm %s "
"after block job", vm->def->name);
if (persistentDef->mem.cur_balloon > newmem)
persistentDef->mem.cur_balloon = newmem;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps,
+ persistentDef);
goto endjob;
}
if (persistentDef) {
persistentDef->mem.cur_balloon = newmem;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps,
+ persistentDef);
goto endjob;
}
}
goto endjob;
}
persistentDef->memballoon->period = period;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef);
goto endjob;
}
goto endjob;
}
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps,
+ persistentDef) < 0)
goto endjob;
}
goto endjob;
}
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef);
goto endjob;
}
if (!(persistentDef->cputune.emulatorpin = virBitmapNewCopy(pcpumap)))
goto endjob;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef);
goto endjob;
}
iothrid->cpumask = cpumask;
iothrid->autofill = false;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef);
goto endjob;
}
persistentDef->iothreads--;
}
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps,
+ persistentDef) < 0)
goto endjob;
}
}
vm->persistent = 1;
- if (virDomainSaveConfig(cfg->configDir,
+ if (virDomainSaveConfig(cfg->configDir, driver->caps,
vm->newDef ? vm->newDef : vm->def) < 0) {
if (oldDef) {
/* There is backup so this VM was defined before.
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
/* Finally, if no error until here, we can save config. */
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- ret = virDomainSaveConfig(cfg->configDir, vmdef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (!ret) {
virDomainObjAssignDef(vm, vmdef, false, NULL);
vmdef = NULL;
}
}
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0)
ret = -1;
}
goto endjob;
if (flags & VIR_DOMAIN_AFFECT_CONFIG &&
- virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0)
goto endjob;
ret = 0;
-1, mode, nodeset) < 0)
goto endjob;
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0)
goto endjob;
}
}
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
- rc = virDomainSaveConfig(cfg->configDir, vmdef);
+ rc = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
if (rc < 0)
goto endjob;
}
}
- if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0)
goto endjob;
}
}
defdisk->src->format = snapdisk->src->format;
- if (virDomainSaveConfig(cfg->configDir, vm->def) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def) < 0)
goto cleanup;
}
}
if (ret == 0 || !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION)) {
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0 ||
- (persist && virDomainSaveConfig(cfg->configDir, vm->newDef) < 0))
+ (persist && virDomainSaveConfig(cfg->configDir, driver->caps,
+ vm->newDef) < 0))
ret = -1;
}
virObjectUnref(cfg);
info.write_iops_sec = oldinfo->write_iops_sec;
}
conf_disk->blkdeviotune = info;
- ret = virDomainSaveConfig(cfg->configDir, persistentDef);
+ ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef);
if (ret < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("Write to config file failed"));
vm->def->name = new_dom_name;
new_dom_name = NULL;
- if (virDomainSaveConfig(cfg->configDir, vm->def) < 0)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def) < 0)
goto rollback;
if (virFileExists(old_dom_cfg_file) &&
if (!(vmdef = virDomainObjGetPersistentDef(caps, driver->xmlopt, vm)))
goto error;
- if (virDomainSaveConfig(cfg->configDir, vmdef) < 0 && !ignoreSaveError)
+ if (virDomainSaveConfig(cfg->configDir, driver->caps, vmdef) < 0 &&
+ !ignoreSaveError)
goto error;
event = virDomainEventLifecycleNewFromObj(vm,
static int
qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
+ virCapsPtr caps,
virDomainObjPtr vm,
bool migrated)
{
generated = true;
if (vm->persistent &&
- virDomainSaveConfig(cfg->configDir, vm->def) < 0)
+ virDomainSaveConfig(cfg->configDir, caps, vm->def) < 0)
goto cleanup;
}
* Fill them in prior to setting the domain def as transient. */
VIR_DEBUG("Generating paths");
- if (qemuPrepareNVRAM(cfg, vm, migration) < 0)
+ if (qemuPrepareNVRAM(cfg, caps, vm, migration) < 0)
goto stop;
/* Do this upfront, so any part of the startup process can add
def = NULL;
vm->persistent = 1;
- if (virDomainSaveConfig(driver->configDir,
+ if (virDomainSaveConfig(driver->configDir, driver->caps,
vm->newDef ? vm->newDef : vm->def) < 0) {
virDomainObjListRemove(driver->domains,
vm);