qemu: change first arg of qemuDomainAttachChrDeviceAssignAddr()

from virDomainDefPtr to virDomainObjPtr so that the function has
access to the other parts of the virDomainObjPtr. Take advantage of
this by removing the "priv" arg and retrieving it from the
virDomainObjPtr instead.

No functional change.
This commit is contained in:
Laine Stump 2016-10-12 15:24:57 -04:00
parent 116564e3b0
commit dbe481a14a

View File

@ -1636,10 +1636,11 @@ qemuDomainChrRemove(virDomainDefPtr vmdef,
}
static int
qemuDomainAttachChrDeviceAssignAddr(virDomainDefPtr def,
qemuDomainObjPrivatePtr priv,
qemuDomainAttachChrDeviceAssignAddr(virDomainObjPtr vm,
virDomainChrDefPtr chr)
{
virDomainDefPtr def = vm->def;
qemuDomainObjPrivatePtr priv = vm->privateData;
int ret = -1;
virDomainVirtioSerialAddrSetPtr vioaddrs = NULL;
@ -1715,7 +1716,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0)
goto cleanup;
if ((rc = qemuDomainAttachChrDeviceAssignAddr(vm->def, priv, chr)) < 0)
if ((rc = qemuDomainAttachChrDeviceAssignAddr(vm, chr)) < 0)
goto cleanup;
if (rc == 1)
need_release = true;