From nobody Sat Nov 1 08:12:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526292409739576.6693399473073; Mon, 14 May 2018 03:06:49 -0700 (PDT) Received: from localhost ([::1]:54881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIANU-0001xC-RW for importer@patchew.org; Mon, 14 May 2018 06:06:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIAHc-0003jZ-VO for qemu-devel@nongnu.org; Mon, 14 May 2018 06:00:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIAHY-0004yz-Dx for qemu-devel@nongnu.org; Mon, 14 May 2018 06:00:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60708 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fIAHY-0004yn-9E; Mon, 14 May 2018 06:00:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C08D2406EE0F; Mon, 14 May 2018 10:00:39 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-219.ams2.redhat.com [10.36.116.219]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4129E2024CBA; Mon, 14 May 2018 10:00:37 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 12:00:09 +0200 Message-Id: <20180514100023.12542-5-david@redhat.com> In-Reply-To: <20180514100023.12542-1-david@redhat.com> References: <20180514100023.12542-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 14 May 2018 10:00:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 14 May 2018 10:00:39 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'david@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 04/18] pc: prepare for multi stage hotplug handlers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pankaj Gupta , Eduardo Habkost , "Michael S . Tsirkin" , Cornelia Huck , David Hildenbrand , Markus Armbruster , Alexander Graf , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Marcel Apfelbaum , Igor Mammedov , Luiz Capitulino , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For multi stage hotplug handlers, we'll have to do some error handling in some hotplug functions, so let's use a local error variable (except for unplug requests). Also, add code to pass control to the final stage hotplug handler at the parent bus. Signed-off-by: David Hildenbrand --- hw/i386/pc.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d768930d02..510076e156 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2007,19 +2007,32 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug= _dev, static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + Error *local_err =3D NULL; + + /* final stage hotplug handler */ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { - pc_cpu_pre_plug(hotplug_dev, dev, errp); + pc_cpu_pre_plug(hotplug_dev, dev, &local_err); + } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) { + hotplug_handler_pre_plug(dev->parent_bus->hotplug_handler, dev, + &local_err); } + error_propagate(errp, local_err); } =20 static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + Error *local_err =3D NULL; + + /* final stage hotplug handler */ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_plug(hotplug_dev, dev, errp); + pc_dimm_plug(hotplug_dev, dev, &local_err); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { - pc_cpu_plug(hotplug_dev, dev, errp); + pc_cpu_plug(hotplug_dev, dev, &local_err); + } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) { + hotplug_handler_plug(dev->parent_bus->hotplug_handler, dev, &local= _err); } + error_propagate(errp, local_err); } =20 static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_de= v, @@ -2029,7 +2042,10 @@ static void pc_machine_device_unplug_request_cb(Hotp= lugHandler *hotplug_dev, 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 { + } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) { + hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler, d= ev, + errp); + } else if (!dev->parent_bus) { error_setg(errp, "acpi: device unplug request for not supported de= vice" " type: %s", object_get_typename(OBJECT(dev))); } @@ -2038,14 +2054,21 @@ static void pc_machine_device_unplug_request_cb(Hot= plugHandler *hotplug_dev, static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + Error *local_err =3D NULL; + + /* final stage hotplug handler */ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_unplug(hotplug_dev, dev, errp); + pc_dimm_unplug(hotplug_dev, dev, &local_err); } 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" + pc_cpu_unplug_cb(hotplug_dev, dev, &local_err); + } else if (dev->parent_bus && dev->parent_bus->hotplug_handler) { + hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev, + &local_err); + } else if (!dev->parent_bus) { + error_setg(&local_err, "acpi: device unplug for not supported devi= ce" " type: %s", object_get_typename(OBJECT(dev))); } + error_propagate(errp, local_err); } =20 static HotplugHandler *pc_get_hotpug_handler(MachineState *machine, --=20 2.14.3