From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYki-0002Z2-TB for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPYkg-0002ml-Ud for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:24:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYkg-0002mg-Oe for qemu-devel@nongnu.org; Tue, 19 Jul 2016 13:24:14 -0400 From: Eduardo Habkost Date: Tue, 19 Jul 2016 14:22:55 -0300 Message-Id: <1468948976-30660-28-git-send-email-ehabkost@redhat.com> In-Reply-To: <1468948976-30660-1-git-send-email-ehabkost@redhat.com> References: <1468948976-30660-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 27/28] target-i386: Add x86_cpu_unrealizefn() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Richard Henderson , qemu-devel@nongnu.org, Igor Mammedov From: Igor Mammedov 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 Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 73ed447..f904671 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3117,6 +3117,21 @@ 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)); + cpu->apic_state = NULL; + } +} + typedef struct BitProperty { uint32_t *ptr; uint32_t mask; @@ -3363,6 +3378,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.5.5