From nobody Tue Feb 10 00:23:05 2026 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=1597725678; cv=none; d=zohomail.com; s=zohoarc; b=aWNkZdCwGqMBMz3QeN+GD+bVU7310/JTVBG1jRC8Gba0pIr0d0nFiGgnPXTEX2TpWe9pcHaVlOVWV3r0rWbKym4qfFn14U+DvSbBlaIhgsUShhe9AKe9X0Ium8aJVxKalnROJFZEeZUMqsCu2sxFGmns/jjTZ+WgzwnySPIrBU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597725678; h=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=Ty7wI4+F6xsI7S9L9VXTAsllBlfLHbJNIy5u7qAQwyU=; b=lN3i/GiydwOXDNYirx1AatzOlNd3riJaXOZBz2biDO+Taoh7aLIwfyFf8I8OJgrpkznc0w81LW7NV+mNTCKuBqHnZKqQaOsXpmyPchuyXBKl9mlG5sJUXYzcJfNxxneXBcb8CQPK6lXvNuYpV5Nvi6YVRLX4yi8GGtJ38ZBr+2E= 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 1597725678556468.5330426898805; Mon, 17 Aug 2020 21:41:18 -0700 (PDT) Received: from localhost ([::1]:34970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7tQz-0004Ty-9Q for importer@patchew.org; Tue, 18 Aug 2020 00:41:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7t7W-000145-6h; Tue, 18 Aug 2020 00:21:10 -0400 Received: from ozlabs.org ([203.11.71.1]:59697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7t7T-0006Rv-2k; Tue, 18 Aug 2020 00:21:09 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4BVyNj1rtDz9sW6; Tue, 18 Aug 2020 14:19:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1597724373; bh=nYzC9Ou1s4gDVV7OEYd0gfWrCZnk8V/7nue7+qfnWO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P+l21GYdvp2fOc/6ZLO5zndFSBgdN1/u+LVO5STJ+d6PmF7/sWro/NUdbVW1iTQ5z j4o23cxJfeLx8G+NrUv9tXbmzS8hTPojlWEV7dM3fac3ttdlVrXcgUXiS1cMAG5O02 jMA0QEpQniMB6o2MWw66/lklShn4Kv5A0DTAzmc8= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 36/40] spapr/xive: Simplify error handling in kvmppc_xive_connect() Date: Tue, 18 Aug 2020 14:19:18 +1000 Message-Id: <20200818041922.251708-37-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200818041922.251708-1-david@gibson.dropbear.id.au> References: <20200818041922.251708-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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/08/18 00:19:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Now that all these functions return a negative errno on failure, check that and get rid of the local_err boilerplate. Signed-off-by: Greg Kurz Message-Id: <159707851537.1489912.1030839306195472651.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/intc/spapr_xive_kvm.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index 005729ebff..e9a36115be 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -723,12 +723,12 @@ int kvmppc_xive_connect(SpaprInterruptController *int= c, uint32_t nr_servers, { SpaprXive *xive =3D SPAPR_XIVE(intc); XiveSource *xsrc =3D &xive->source; - Error *local_err =3D NULL; size_t esb_len =3D xive_source_esb_len(xsrc); size_t tima_len =3D 4ull << TM_SHIFT; CPUState *cs; int fd; void *addr; + int ret; =20 /* * The KVM XIVE device already in use. This is the case when @@ -754,9 +754,10 @@ int kvmppc_xive_connect(SpaprInterruptController *intc= , uint32_t nr_servers, /* Tell KVM about the # of VCPUs we may have */ if (kvm_device_check_attr(xive->fd, KVM_DEV_XIVE_GRP_CTRL, KVM_DEV_XIVE_NR_SERVERS)) { - if (kvm_device_access(xive->fd, KVM_DEV_XIVE_GRP_CTRL, - KVM_DEV_XIVE_NR_SERVERS, &nr_servers, true, - &local_err)) { + ret =3D kvm_device_access(xive->fd, KVM_DEV_XIVE_GRP_CTRL, + KVM_DEV_XIVE_NR_SERVERS, &nr_servers, true, + errp); + if (ret < 0) { goto fail; } } @@ -764,8 +765,7 @@ int kvmppc_xive_connect(SpaprInterruptController *intc,= uint32_t nr_servers, /* * 1. Source ESB pages - KVM mapping */ - addr =3D kvmppc_xive_mmap(xive, KVM_XIVE_ESB_PAGE_OFFSET, esb_len, - &local_err); + addr =3D kvmppc_xive_mmap(xive, KVM_XIVE_ESB_PAGE_OFFSET, esb_len, err= p); if (addr =3D=3D MAP_FAILED) { goto fail; } @@ -783,8 +783,7 @@ int kvmppc_xive_connect(SpaprInterruptController *intc,= uint32_t nr_servers, /* * 3. TIMA pages - KVM mapping */ - addr =3D kvmppc_xive_mmap(xive, KVM_XIVE_TIMA_PAGE_OFFSET, tima_len, - &local_err); + addr =3D kvmppc_xive_mmap(xive, KVM_XIVE_TIMA_PAGE_OFFSET, tima_len, e= rrp); if (addr =3D=3D MAP_FAILED) { goto fail; } @@ -802,15 +801,15 @@ int kvmppc_xive_connect(SpaprInterruptController *int= c, uint32_t nr_servers, CPU_FOREACH(cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); =20 - kvmppc_xive_cpu_connect(spapr_cpu_state(cpu)->tctx, &local_err); - if (local_err) { + ret =3D kvmppc_xive_cpu_connect(spapr_cpu_state(cpu)->tctx, errp); + if (ret < 0) { goto fail; } } =20 /* Update the KVM sources */ - kvmppc_xive_source_reset(xsrc, &local_err); - if (local_err) { + ret =3D kvmppc_xive_source_reset(xsrc, errp); + if (ret < 0) { goto fail; } =20 @@ -820,7 +819,6 @@ int kvmppc_xive_connect(SpaprInterruptController *intc,= uint32_t nr_servers, return 0; =20 fail: - error_propagate(errp, local_err); kvmppc_xive_disconnect(intc); return -1; } --=20 2.26.2