External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 14:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvz: Remove use of virDomainLiveConfigHelperMethod

Browse Source
This commit is contained in:
Peter Krempa 2016-07-01 16:07:51 +02:00
parent fcc3ccf3cd
commit 3bd161f862
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/openvz/openvz_driver.c
View File

@ -2084,7 +2084,7 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
struct openvz_driver *driver = dom->conn->privateData; struct openvz_driver *driver = dom->conn->privateData;
virDomainDeviceDefPtr dev = NULL; virDomainDeviceDefPtr dev = NULL;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr vmdef = NULL; virDomainDefPtr def = NULL;
bool persist = false; bool persist = false;
virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE |
@ -2098,22 +2098,17 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
_("no domain with matching uuid")); _("no domain with matching uuid"));
goto cleanup; goto cleanup;
} }
vmdef = vm->def;
if (virStrToLong_i(vmdef->name, NULL, 10, &veid) < 0) { if (virStrToLong_i(vm->def->name, NULL, 10, &veid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not convert domain name to VEID")); _("Could not convert domain name to VEID"));
goto cleanup; goto cleanup;
} }
if (virDomainLiveConfigHelperMethod(driver->caps, if (!(def = virDomainObjGetOneDef(vm, flags)))
driver->xmlopt,
vm,
&flags,
&vmdef) < 0)
goto cleanup; goto cleanup;
dev = virDomainDeviceDefParse(xml, vmdef, driver->caps, driver->xmlopt, dev = virDomainDeviceDefParse(xml, def, driver->caps, driver->xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE); VIR_DOMAIN_DEF_PARSE_INACTIVE);
if (!dev) if (!dev)
goto cleanup; goto cleanup;
@ -2121,7 +2116,7 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
if (flags & VIR_DOMAIN_AFFECT_CONFIG) if (flags & VIR_DOMAIN_AFFECT_CONFIG)
persist = true; persist = true;
if (openvzUpdateDevice(vmdef, dev, persist) < 0) if (openvzUpdateDevice(def, dev, persist) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;