From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2gE5-0000gS-1M for qemu-devel@nongnu.org; Tue, 17 May 2016 10:44:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2gE3-0006R9-Mo for qemu-devel@nongnu.org; Tue, 17 May 2016 10:44:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2gE3-0006Qy-EU for qemu-devel@nongnu.org; Tue, 17 May 2016 10:43:59 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D272B80E6A for ; Tue, 17 May 2016 14:43:58 +0000 (UTC) From: Igor Mammedov Date: Tue, 17 May 2016 16:43:09 +0200 Message-Id: <1463496205-251412-18-git-send-email-imammedo@redhat.com> In-Reply-To: <1463496205-251412-1-git-send-email-imammedo@redhat.com> References: <1463496205-251412-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 17/33] pc: add generic CPU unplug callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, rkrcmar@redhat.com, ehabkost@redhat.com, drjones@redhat.com, armbru@redhat.com, marcel@redhat.com Signed-off-by: Igor Mammedov --- hw/acpi/cpu.c | 1 + hw/i386/pc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 171a5f5..73258a1 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -104,6 +104,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, CPUArchIdList *id_list; int i; + assert(mc->possible_cpu_arch_ids); id_list = mc->possible_cpu_arch_ids(machine); state->dev_count = id_list->len; state->devs = g_new0(typeof(*state->devs), state->dev_count); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 99437e0..1cad132 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1713,6 +1713,49 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev, out: error_propagate(errp, local_err); } +static void pc_cpu_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + HotplugHandlerClass *hhc; + Error *local_err = NULL; + PCMachineState *pcms = PC_MACHINE(hotplug_dev); + + hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); + hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); + + if (local_err) { + goto out; + } + + out: + error_propagate(errp, local_err); + +} + +static void pc_cpu_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + HotplugHandlerClass *hhc; + Error *local_err = NULL; + PCMachineState *pcms = PC_MACHINE(hotplug_dev); + + hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); + hhc->unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); + + if (local_err) { + goto out; + } + + /* + * TODO: enable unplug once generic CPU remove bits land + * for now guest will be able to eject CPU ACPI wise but + * it will come back again on machine reset. + */ + /* object_unparent(OBJECT(dev)); */ + + out: + error_propagate(errp, local_err); +} static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) @@ -1729,6 +1772,8 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev, { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { pc_dimm_unplug_request(hotplug_dev, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + pc_cpu_unplug_request_cb(hotplug_dev, dev, errp); } else { error_setg(errp, "acpi: device unplug request for not supported device" " type: %s", object_get_typename(OBJECT(dev))); @@ -1740,6 +1785,8 @@ static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev, { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { pc_dimm_unplug(hotplug_dev, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + pc_cpu_unplug_cb(hotplug_dev, dev, errp); } else { error_setg(errp, "acpi: device unplug for not supported device" " type: %s", object_get_typename(OBJECT(dev))); -- 1.8.3.1