mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 11:22:23 +00:00
vz: keep naming convention for domain objects
see 4385b868
This commit is contained in:
parent
3d211da27b
commit
5013ad4e0f
@ -1208,38 +1208,38 @@ vzDomainSetUserPassword(virDomainPtr domain,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vzDomainUpdateDeviceFlags(virDomainPtr dom,
|
||||
static int vzDomainUpdateDeviceFlags(virDomainPtr domain,
|
||||
const char *xml,
|
||||
unsigned int flags)
|
||||
{
|
||||
int ret = -1;
|
||||
vzConnPtr privconn = dom->conn->privateData;
|
||||
virDomainObjPtr privdom = NULL;
|
||||
vzConnPtr privconn = domain->conn->privateData;
|
||||
virDomainObjPtr dom = NULL;
|
||||
virDomainDeviceDefPtr dev = NULL;
|
||||
vzDriverPtr driver = privconn->driver;
|
||||
|
||||
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
|
||||
VIR_DOMAIN_AFFECT_CONFIG, -1);
|
||||
|
||||
if (!(privdom = vzDomObjFromDomain(dom)))
|
||||
if (!(dom = vzDomObjFromDomain(domain)))
|
||||
return -1;
|
||||
|
||||
if (vzCheckConfigUpdateFlags(privdom, &flags) < 0)
|
||||
if (vzCheckConfigUpdateFlags(dom, &flags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!(dev = virDomainDeviceDefParse(xml, privdom->def, driver->caps,
|
||||
if (!(dev = virDomainDeviceDefParse(xml, dom->def, driver->caps,
|
||||
driver->xmlopt,
|
||||
VIR_DOMAIN_XML_INACTIVE)))
|
||||
goto cleanup;
|
||||
|
||||
if (prlsdkUpdateDevice(driver, privdom, dev) < 0)
|
||||
if (prlsdkUpdateDevice(driver, dom, dev) < 0)
|
||||
goto cleanup;
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
|
||||
virDomainDeviceDefFree(dev);
|
||||
virObjectUnlock(privdom);
|
||||
virObjectUnlock(dom);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user