diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2016-06-24 16:01:02 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-07-20 12:02:20 -0300 |
| commit | c884776e9dc947105827bd6c22192863f97267d2 (patch) | |
| tree | 65878be5c0d7c89081c51f9044b4925cd545c5bd | |
| parent | f6e984443f1634eee8d6876a7cce039b976c95e0 (diff) | |
target-i386: Add x86_cpu_unrealizefn()
First remove VCPU from exec loop and only then remove lapic.
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target-i386/cpu.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 3df5f5f195..6a1afab595 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3114,6 +3114,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; @@ -3360,6 +3375,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; |