From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKgDi-0006u5-HL for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:22:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKgDg-0004Yb-8d for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:22:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKgDg-0004YU-3L for qemu-devel@nongnu.org; Wed, 06 Jul 2016 02:22:00 -0400 From: Igor Mammedov Date: Wed, 6 Jul 2016 08:20:54 +0200 Message-Id: <1467786055-85835-19-git-send-email-imammedo@redhat.com> In-Reply-To: <1467786055-85835-1-git-send-email-imammedo@redhat.com> References: <1467786055-85835-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v3 18/19] target-i386: add x86_cpu_unrealizefn() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pkrempa@redhat.com, ehabkost@redhat.com, mst@redhat.com, armbru@redhat.com, eduardo.otubo@profitbricks.com, marcel@redhat.com, pbonzini@redhat.com, rth@twiddle.net first remove VCPU from exec loop and only then remove lapic. Signed-off-by: Chen Fan Signed-off-by: Gu Zheng Signed-off-by: Zhu Guihua Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 2fa445d..f86dae0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2963,6 +2963,20 @@ out: } } +static void x86_cpu_unrealizefn(DeviceState *dev, Error **errp) +{ + X86CPU *cpu = X86_CPU(dev); + +#ifndef CONFIG_USER_ONLY + cpu_remove_sync(CPU(dev)); + qemu_unregister_reset(x86_cpu_machine_reset_cb, dev); +#endif + + if (cpu->apic_state) { + object_unparent(OBJECT(cpu->apic_state)); + } +} + typedef struct BitProperty { uint32_t *ptr; uint32_t mask; @@ -3205,6 +3219,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; + dc->unrealize = x86_cpu_unrealizefn; dc->props = x86_cpu_properties; xcc->parent_reset = cc->reset; -- 2.7.0