From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCRc-0001zL-T1 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:46:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOCRZ-0003Qk-N3 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:46:08 -0500 Received: from mail.kernel.org ([198.145.29.136]:51408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCRZ-0003QV-3A for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:46:05 -0500 Date: Wed, 18 Feb 2015 22:45:57 +0100 From: "Michael S. Tsirkin" Message-ID: <1424295164-4774-20-git-send-email-mst@redhat.com> References: <1424295164-4774-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424295164-4774-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 19/96] acpi, pc: Add unplug cb for pc machine. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Zhu Guihua , Juan Quintela , dgilbert@redhat.com, Tang Chen , Anthony Liguori , Paolo Bonzini , Igor Mammedov , Richard Henderson From: Tang Chen Memory and CPU hot unplug are both asynchronous procedures. When the unplug operation happens, unplug request cb is called first. And when guest OS finished handling unplug, unplug cb will be called to do the real removal of device. This patch adds hotunplug cb to pc machine, which memory and CPU hot unplug will use it. Reviewed-by: Igor Mammedov Signed-off-by: Tang Chen Signed-off-by: Zhu Guihua Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 15ee10a..850b6b5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1687,6 +1687,13 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev, " type: %s", object_get_typename(OBJECT(dev))); } +static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + error_setg(errp, "acpi: device unplug for not supported device" + " type: %s", object_get_typename(OBJECT(dev))); +} + static HotplugHandler *pc_get_hotpug_handler(MachineState *machine, DeviceState *dev) { @@ -1817,6 +1824,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->get_hotplug_handler = pc_get_hotpug_handler; hc->plug = pc_machine_device_plug_cb; hc->unplug_request = pc_machine_device_unplug_request_cb; + hc->unplug = pc_machine_device_unplug_cb; } static const TypeInfo pc_machine_info = { -- MST