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

qemu: Remove unused persistentAddrs

Browse Source 
Based on some digital archaeology performed by jtomko, it's been determined
that the persistentAddrs variable is no longer necessary...

The variable was added by:
commit 141dea6bc7
CommitDate: 2010-02-12 17:25:52 +0000
    Add persistence of PCI addresses to QEMU

Where it was set to 0 on domain startup if qemu did not support the
QEMUD_CMD_FLAG_DEVICE capability, to clear the addresses at shutdown,
because QEMU might make up different ones next time.

As of commit f5dd58a608
CommitDate: 2012-07-11 11:19:05 +0200
    qemu: Extended qemuDomainAssignAddresses to be callable from
    everywhere.

this was broken, when the persistentAddrs = 0 assignment was moved
inside qemuDomainAssignPCIAddresses and while it pretends to check
for !QEMU_CAPS_DEVICE, its parent qemuDomainAssignAddresses is only
called if QEMU_CAPS_DEVICE is present.
This commit is contained in:
John Ferlan 2016-05-24 18:40:22 -04:00
parent f30672d5ee
commit fb06350021
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_domain.h
View File

@ -190,7 +190,6 @@ struct _qemuDomainObjPrivate {
virDomainPCIAddressSetPtr pciaddrs; virDomainPCIAddressSetPtr pciaddrs;
virDomainCCWAddressSetPtr ccwaddrs; virDomainCCWAddressSetPtr ccwaddrs;
virDomainVirtioSerialAddrSetPtr vioserialaddrs; virDomainVirtioSerialAddrSetPtr vioserialaddrs;
int persistentAddrs;
virQEMUCapsPtr qemuCaps; virQEMUCapsPtr qemuCaps;
char *lockState; char *lockState;

5
src/qemu/qemu_domain_address.c
View File

@ -149,7 +149,6 @@ qemuDomainAssignVirtioSerialAddresses(virDomainDefPtr def,
priv = obj->privateData; priv = obj->privateData;
/* if this is the live domain object, we persist the addresses */ /* if this is the live domain object, we persist the addresses */
virDomainVirtioSerialAddrSetFree(priv->vioserialaddrs); virDomainVirtioSerialAddrSetFree(priv->vioserialaddrs);
priv->persistentAddrs = 1;
priv->vioserialaddrs = addrs; priv->vioserialaddrs = addrs;
addrs = NULL; addrs = NULL;
} }
@ -382,11 +381,8 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def,
if (addrs) { if (addrs) {
/* if this is the live domain object, we persist the CCW addresses*/ /* if this is the live domain object, we persist the CCW addresses*/
virDomainCCWAddressSetFree(priv->ccwaddrs); virDomainCCWAddressSetFree(priv->ccwaddrs);
priv->persistentAddrs = 1;
priv->ccwaddrs = addrs; priv->ccwaddrs = addrs;
addrs = NULL; addrs = NULL;
} else {
priv->persistentAddrs = 0;
} }
} }
ret = 0; ret = 0;
@ -1616,7 +1612,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
priv = obj->privateData; priv = obj->privateData;
/* if this is the live domain object, we persist the PCI addresses */ /* if this is the live domain object, we persist the PCI addresses */
virDomainPCIAddressSetFree(priv->pciaddrs); virDomainPCIAddressSetFree(priv->pciaddrs);
priv->persistentAddrs = 1;
priv->pciaddrs = addrs; priv->pciaddrs = addrs;
addrs = NULL; addrs = NULL;
} }

10
src/qemu/qemu_process.c
View File

@ -5754,16 +5754,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
priv->qemuDevices = NULL; priv->qemuDevices = NULL;
virDomainDefClearDeviceAliases(vm->def); virDomainDefClearDeviceAliases(vm->def);
if (!priv->persistentAddrs) {
virDomainDefClearPCIAddresses(vm->def);
virDomainPCIAddressSetFree(priv->pciaddrs);
priv->pciaddrs = NULL;
virDomainDefClearCCWAddresses(vm->def);
virDomainCCWAddressSetFree(priv->ccwaddrs);
priv->ccwaddrs = NULL;
virDomainVirtioSerialAddrSetFree(priv->vioserialaddrs);
priv->vioserialaddrs = NULL;
}
qemuHostdevReAttachDomainDevices(driver, vm->def); qemuHostdevReAttachDomainDevices(driver, vm->def);