From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 26 Apr 2017 08:27:49 +0000 (+0200)
Subject: qemu: Move freeing of PCI address list to qemuProcessStop
X-Git-Tag: v3.2.1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a050815a268447dede6a49445885ab4db32824e6;p=thirdparty%2Flibvirt.git

qemu: Move freeing of PCI address list to qemuProcessStop

Rather than freeing the list before starting a new VM clear it after
stopping the old instance when the data becomes invalid.

(cherry picked from commit 44f8e00b6b8e575ee09f301d209c1586b527f8c1)
---

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 22d8bf67d9..f2f9381c61 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -2221,7 +2221,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
     if (obj && obj->privateData) {
         priv = obj->privateData;
         /* if this is the live domain object, we persist the PCI addresses */
-        virDomainPCIAddressSetFree(priv->pciaddrs);
         priv->pciaddrs = addrs;
         addrs = NULL;
     }
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index a6ecda3976..961afd70a9 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6438,6 +6438,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     priv->autoCpuset = NULL;
 
     /* remove address data */
+    virDomainPCIAddressSetFree(priv->pciaddrs);
+    priv->pciaddrs = NULL;
     virDomainUSBAddressSetFree(priv->usbaddrs);
     priv->usbaddrs = NULL;