From nobody Tue Feb 10 00:22:24 2026 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 1528390822377828.1688870629185; Thu, 7 Jun 2018 10:00:22 -0700 (PDT) Received: from localhost ([::1]:59263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQyGn-00033c-Ck for importer@patchew.org; Thu, 07 Jun 2018 13:00:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQy9N-0002tZ-Cu for qemu-devel@nongnu.org; Thu, 07 Jun 2018 12:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQy9J-0001xt-5s for qemu-devel@nongnu.org; Thu, 07 Jun 2018 12:52:37 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36106 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 1fQy9J-0001wf-0b; Thu, 07 Jun 2018 12:52:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D99740200A0; Thu, 7 Jun 2018 16:52:32 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-240.ams2.redhat.com [10.36.117.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2562F200BAB6; Thu, 7 Jun 2018 16:52:30 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 7 Jun 2018 18:52:14 +0200 Message-Id: <20180607165218.9558-5-david@redhat.com> In-Reply-To: <20180607165218.9558-1-david@redhat.com> References: <20180607165218.9558-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 07 Jun 2018 16:52:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 07 Jun 2018 16:52:32 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.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 v1 4/8] spapr: local error handling in hotplug handler functions 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: Cornelia Huck , Eduardo Habkost , "Michael S . Tsirkin" , Peter Crosthwaite , david@redhat.com, Alexander Graf , Greg Kurz , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Igor Mammedov , Paolo Bonzini , 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" Let's introduce and use local error variables in the hotplug handler functions. Signed-off-by: David Hildenbrand Acked-by: David Gibson Reviewed-by: Greg Kurz --- hw/ppc/spapr.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a12be24ca9..4447cb197f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3576,11 +3576,14 @@ out: static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + Error *local_err =3D NULL; + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - spapr_memory_plug(hotplug_dev, dev, errp); + spapr_memory_plug(hotplug_dev, dev, &local_err); } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { - spapr_core_plug(hotplug_dev, dev, errp); + spapr_core_plug(hotplug_dev, dev, &local_err); } + error_propagate(errp, local_err); } =20 static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_de= v, @@ -3588,10 +3591,11 @@ static void spapr_machine_device_unplug_request(Hot= plugHandler *hotplug_dev, { sPAPRMachineState *sms =3D SPAPR_MACHINE(OBJECT(hotplug_dev)); MachineClass *mc =3D MACHINE_GET_CLASS(sms); + Error *local_err =3D NULL; =20 if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { if (spapr_ovec_test(sms->ov5_cas, OV5_HP_EVT)) { - spapr_memory_unplug_request(hotplug_dev, dev, errp); + spapr_memory_unplug_request(hotplug_dev, dev, &local_err); } else { /* NOTE: this means there is a window after guest reset, prior= to * CAS negotiation, where unplug requests will fail due to the @@ -3599,25 +3603,32 @@ static void spapr_machine_device_unplug_request(Hot= plugHandler *hotplug_dev, * the case with PCI unplug, where the events will be queued a= nd * eventually handled by the guest after boot */ - error_setg(errp, "Memory hot unplug not supported for this gue= st"); + error_setg(&local_err, + "Memory hot unplug not supported for this guest"); } } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { if (!mc->has_hotpluggable_cpus) { - error_setg(errp, "CPU hot unplug not supported on this machine= "); - return; + error_setg(&local_err, + "CPU hot unplug not supported on this machine"); + goto out; } - spapr_core_unplug_request(hotplug_dev, dev, errp); + spapr_core_unplug_request(hotplug_dev, dev, &local_err); } +out: + error_propagate(errp, local_err); } =20 static void spapr_machine_device_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + Error *local_err =3D NULL; + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - spapr_memory_pre_plug(hotplug_dev, dev, errp); + spapr_memory_pre_plug(hotplug_dev, dev, &local_err); } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { - spapr_core_pre_plug(hotplug_dev, dev, errp); + spapr_core_pre_plug(hotplug_dev, dev, &local_err); } + error_propagate(errp, local_err); } =20 static HotplugHandler *spapr_get_hotplug_handler(MachineState *machine, --=20 2.17.0