From nobody Mon Nov 17 01:31:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1602239817; cv=none; d=zohomail.com; s=zohoarc; b=R/EAMld6lkNwlXYAq/Jtn2GkfU6XgeAKQ/00SVv99VmDmbiBvTmIY8Cepf8u/eW0ot2TOYrnGv1/0OkEqWUr+m5MgkjViiBGSILJ4/P7rjQsjumfuekdpgUphaUN4MWKJZF1G7A3orrjFnUXt17ojuPmkzKnqyFHWMRVKGj5kFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602239817; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VYkyrCCFWdeiqTBWHBi7tDPxx8xY7Mu9jL2MJOdr/0o=; b=bteCDdB/pE+EsM6WhNT8vfSK9/NG2uSw61NyxGkJsNRUUbIXtVuV+cRtx1Fk/hleVa3dS77U/CM+eYFU9w3PYmp4n9+zoVqOarN0GqxVIx47Fk9tmVweZ/qOhv9408M0u480EdJvBO93yFxkGJsON/bNpjnjIy2rxBHJe8y7E+4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602239817818120.88950419664468; Fri, 9 Oct 2020 03:36:57 -0700 (PDT) Received: from localhost ([::1]:59336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQplg-00079j-IK for importer@patchew.org; Fri, 09 Oct 2020 06:36:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVa-0005Np-KK for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:18 -0400 Received: from ozlabs.org ([203.11.71.1]:55957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVX-0001nf-Nw for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:18 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4C73wb4qr1z9sWK; Fri, 9 Oct 2020 21:19:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1602238799; bh=7UAQ27JWZpmDGCPmSO/grFPvEyc6GK1bknvnZwBLyhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=diKR/PwYDbQB2WSJ0XHoC+L74F5M9Fnc88a+7Km7uc5jgutDmviIPTQaCAzZGhGzd ja8hbbkLsxGvvFmbeoQoBLE1lJVIEgWnOvKn/r15k4he6faljmxgj6JWTW/ik35Zz9 wexDBHlFs7HNPJbThsu5Ey60sDBm6Cd2abjFMwkI= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 12/20] spapr: Simplify error handling in spapr_cpu_core_realize() Date: Fri, 9 Oct 2020 21:19:43 +1100 Message-Id: <20201009101951.1569252-13-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009101951.1569252-1-david@gibson.dropbear.id.au> References: <20201009101951.1569252-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 06:19:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , dbarboza@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nonngu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Greg Kurz As recommended in "qapi/error.h", add a bool return value to spapr_realize_vcpu() and use it in spapr_cpu_core_realize() in order to get rid of the error propagation overhead. Signed-off-by: Greg Kurz Message-Id: <20200914123505.612812-12-groug@kaod.org> Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson --- hw/ppc/spapr_cpu_core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 0c879d4da2..b03620823a 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -227,14 +227,14 @@ static void spapr_cpu_core_unrealize(DeviceState *dev) g_free(sc->threads); } =20 -static void spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr, +static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr, SpaprCpuCore *sc, Error **errp) { CPUPPCState *env =3D &cpu->env; CPUState *cs =3D CPU(cpu); =20 if (!qdev_realize(DEVICE(cpu), NULL, errp)) { - return; + return false; } =20 /* Set time-base frequency to 512 MHz */ @@ -245,13 +245,14 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, Spapr= MachineState *spapr, =20 if (spapr_irq_cpu_intc_create(spapr, cpu, errp) < 0) { cpu_remove_sync(CPU(cpu)); - return; + return false; } =20 if (!sc->pre_3_0_migration) { vmstate_register(NULL, cs->cpu_index, &vmstate_spapr_cpu_state, cpu->machine_data); } + return true; } =20 static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc, int i, Error **errp) @@ -312,7 +313,6 @@ static void spapr_cpu_core_realize(DeviceState *dev, Er= ror **errp) TYPE_SPAPR_MACHINE); SpaprCpuCore *sc =3D SPAPR_CPU_CORE(OBJECT(dev)); CPUCore *cc =3D CPU_CORE(OBJECT(dev)); - Error *local_err =3D NULL; int i, j; =20 if (!spapr) { @@ -322,15 +322,14 @@ static void spapr_cpu_core_realize(DeviceState *dev, = Error **errp) =20 sc->threads =3D g_new(PowerPCCPU *, cc->nr_threads); for (i =3D 0; i < cc->nr_threads; i++) { - sc->threads[i] =3D spapr_create_vcpu(sc, i, &local_err); - if (local_err) { + sc->threads[i] =3D spapr_create_vcpu(sc, i, errp); + if (!sc->threads[i]) { goto err; } } =20 for (j =3D 0; j < cc->nr_threads; j++) { - spapr_realize_vcpu(sc->threads[j], spapr, sc, &local_err); - if (local_err) { + if (!spapr_realize_vcpu(sc->threads[j], spapr, sc, errp)) { goto err_unrealize; } } @@ -347,7 +346,6 @@ err: spapr_delete_vcpu(sc->threads[i], sc); } g_free(sc->threads); - error_propagate(errp, local_err); } =20 static Property spapr_cpu_core_properties[] =3D { --=20 2.26.2