From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com,
mst@redhat.com, armbru@redhat.com,
eduardo.otubo@profitbricks.com, eblake@redhat.com,
pkrempa@redhat.com, marcel@redhat.com
Subject: [Qemu-devel] [PATCH v2 17/18] target-i386: add x86_cpu_unrealizefn()
Date: Fri, 24 Jun 2016 18:06:05 +0200 [thread overview]
Message-ID: <1466784366-281935-18-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1466784366-281935-1-git-send-email-imammedo@redhat.com>
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>
---
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;
--
1.8.3.1
next prev parent reply other threads:[~2016-06-24 16:06 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 16:05 [Qemu-devel] [PATCH v2 00/18] pc: add CPU hot-add/hot-remove with device_add/device_del Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 01/18] target-i386: cpu: use uint32_t for X86CPU.apic_id Igor Mammedov
2016-07-04 14:09 ` Michael S. Tsirkin
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 02/18] pc: add x86_topo_ids_from_apicid() Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 03/18] pc: extract CPU lookup into a separate function Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 04/18] pc: cpu: consolidate apic-id validity checks in pc_cpu_pre_plug() Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 05/18] target-i386: cpu: replace custom apic-id setter/getter with static property Igor Mammedov
2016-06-24 16:33 ` Eric Blake
2016-06-28 7:45 ` Igor Mammedov
2016-07-04 14:10 ` Michael S. Tsirkin
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 06/18] target-i386: add socket/core/thread properties to X86CPU Igor Mammedov
2016-07-04 14:12 ` Michael S. Tsirkin
2016-07-04 16:40 ` Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 07/18] pc: set APIC ID based on socket/core/thread ids if it's not been set yet Igor Mammedov
2016-07-04 19:17 ` Eduardo Habkost
2016-07-05 5:31 ` Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 08/18] pc: implement query-hotpluggable-cpus callback Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 09/18] pc: delay setting number of boot CPUs to machine_done time Igor Mammedov
2016-07-04 14:17 ` Michael S. Tsirkin
2016-07-04 16:15 ` Igor Mammedov
2016-07-04 16:42 ` Michael S. Tsirkin
2016-07-05 5:29 ` Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 10/18] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug() Igor Mammedov
2016-06-24 16:05 ` [Qemu-devel] [PATCH v2 11/18] pc: cpu: allow device_add to be used with x86 cpu Igor Mammedov
2016-06-24 16:06 ` [Qemu-devel] [PATCH v2 12/18] apic: move MAX_APICS check to 'apic' class Igor Mammedov
2016-06-24 16:06 ` [Qemu-devel] [PATCH v2 13/18] apic: drop APICCommonState.idx and use APIC ID as index in local_apics[] Igor Mammedov
2016-06-24 16:06 ` [Qemu-devel] [PATCH v2 14/18] (kvm)apic: add unrealize callbacks Igor Mammedov
2016-06-24 16:06 ` [Qemu-devel] [PATCH v2 15/18] target-i386: do not ignore error and fix apic parent Igor Mammedov
2016-07-04 14:20 ` Michael S. Tsirkin
2016-07-04 16:39 ` Igor Mammedov
2016-07-05 7:30 ` Igor Mammedov
2016-06-24 16:06 ` [Qemu-devel] [PATCH v2 16/18] target-i386: fix apic object leak when CPU is deleted Igor Mammedov
2016-07-04 14:19 ` Michael S. Tsirkin
2016-07-04 15:25 ` Igor Mammedov
2016-06-24 16:06 ` Igor Mammedov [this message]
2016-06-24 16:06 ` [Qemu-devel] [PATCH v2 18/18] pc: make device_del CPU work for x86 CPUs Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466784366-281935-18-git-send-email-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo.otubo@profitbricks.com \
--cc=ehabkost@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pkrempa@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).