From: Bharata B Rao <bharata@linux.vnet.ibm.com>
Date: Wed, 12 Apr 2017 08:15:07 +0000 (+0530)
Subject: spapr-cpu-core: Release ICPState object during CPU unrealization
X-Git-Tag: v2.10.0-rc0~227^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f37e54e5b9960151dfb16183fc1c530a0674c77;p=thirdparty%2Fqemu.git

spapr-cpu-core: Release ICPState object during CPU unrealization

Recent commits that re-organized ICPState object missed to destroy
the object when CPU is unrealized. Fix this so that CPU unplug
doesn't abort QEMU.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 2e689b542de..4389ef4c2ae 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -127,6 +127,7 @@ static void spapr_cpu_core_unrealizefn(DeviceState *dev, Error **errp)
         PowerPCCPU *cpu = POWERPC_CPU(cs);
 
         spapr_cpu_destroy(cpu);
+        object_unparent(cpu->intc);
         cpu_remove_sync(cs);
         object_unparent(obj);
     }