On Thu, Jul 14, 2016 at 06:54:44PM +0200, Igor Mammedov wrote: > first remove VCPU from exec loop and only then remove lapic. > > Signed-off-by: Chen Fan <chen.fan.f...@cn.fujitsu.com> > Signed-off-by: Gu Zheng <guz.f...@cn.fujitsu.com> > Signed-off-by: Zhu Guihua <zhugh.f...@cn.fujitsu.com> > Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com> > --- > 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.7.4 > > -- Eduardo