diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 9ac020916c..a9a7295557 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -190,7 +190,6 @@ struct _qemuDomainObjPrivate { virDomainPCIAddressSetPtr pciaddrs; virDomainCCWAddressSetPtr ccwaddrs; virDomainVirtioSerialAddrSetPtr vioserialaddrs; - int persistentAddrs; virQEMUCapsPtr qemuCaps; char *lockState; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 0312d5011a..cbd1927397 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -149,7 +149,6 @@ qemuDomainAssignVirtioSerialAddresses(virDomainDefPtr def, priv = obj->privateData; /* if this is the live domain object, we persist the addresses */ virDomainVirtioSerialAddrSetFree(priv->vioserialaddrs); - priv->persistentAddrs = 1; priv->vioserialaddrs = addrs; addrs = NULL; } @@ -382,11 +381,8 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, if (addrs) { /* if this is the live domain object, we persist the CCW addresses*/ virDomainCCWAddressSetFree(priv->ccwaddrs); - priv->persistentAddrs = 1; priv->ccwaddrs = addrs; addrs = NULL; - } else { - priv->persistentAddrs = 0; } } ret = 0; @@ -1616,7 +1612,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, priv = obj->privateData; /* if this is the live domain object, we persist the PCI addresses */ virDomainPCIAddressSetFree(priv->pciaddrs); - priv->persistentAddrs = 1; priv->pciaddrs = addrs; addrs = NULL; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 106ffcda4b..e847cd1f13 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5754,16 +5754,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, priv->qemuDevices = NULL; 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);