From nobody Thu Nov 20 12:28:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763557774; cv=none; d=zohomail.com; s=zohoarc; b=nDggFwqPm8xPDK0y+iNHKBIe+oss1c1yPQ0WS1AfXE2NZ+u1CLTgn1c5kdglLnmOOzz0FO8IUZ4fVeBiTd7m/C3Y48ynfsH3xi4bFnoQm6SbIbKwCk2Q4ge5JZN3Cv2boaiwniNZzTTDluzxQgUg0MTXvUOixi+CjYO9A/of8D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763557774; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=D6teciZy8520fQI1QLTUyVGW20QyuWqmo6xWXoR980s=; b=aPny/2mX2au26Aaef0+3oeJy680Rx5ET1zU7v15+gcAd/4GnCU4e2j//cOhW49IhINjWIy+ev6FacbjmDTCG/tjdApqJZSEq3QvMYrxQtONTQCJhUbzn6gyQTgO/fqk5yc7PDRc4ApB4yLjS+cPfS4m7ituUZQReM9b6DkFuTf4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763557774119188.8795422961757; Wed, 19 Nov 2025 05:09:34 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1165960.1492632 (Exim 4.92) (envelope-from ) id 1vLhvs-0004AK-P2; Wed, 19 Nov 2025 13:09:12 +0000 Received: by outflank-mailman (output) from mailman id 1165960.1492632; Wed, 19 Nov 2025 13:09:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvs-0004A8-Lm; Wed, 19 Nov 2025 13:09:12 +0000 Received: by outflank-mailman (input) for mailman id 1165960; Wed, 19 Nov 2025 13:09:11 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvr-0003iP-4Q for xen-devel@lists.xenproject.org; Wed, 19 Nov 2025 13:09:11 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ef988f31-c548-11f0-9d18-b5c5bf9af7f9; Wed, 19 Nov 2025 14:09:10 +0100 (CET) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-55-fWja6XeyMdqUfO5drj9beA-1; Wed, 19 Nov 2025 08:09:05 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 37A2A1800343; Wed, 19 Nov 2025 13:09:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4FCEF1800451; Wed, 19 Nov 2025 13:08:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 79C9C21E6935; Wed, 19 Nov 2025 14:08:55 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ef988f31-c548-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763557749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D6teciZy8520fQI1QLTUyVGW20QyuWqmo6xWXoR980s=; b=NwMAWEPkE0StnviJUnR3Qs1gjynzrnenKXqiwyX9jtEbP3VlX+BtvTXUE/TzEG3nGjuJ6s Ky/wFjVf5PNFhPx56TlPqgmEQSG9xlEizZI3F1F7iEsAAP5Uzxav/75UBR5bXD9/znXyZ8 AL2HOcKHrclsfjKEC1cw6bJEtz3cnPM= X-MC-Unique: fWja6XeyMdqUfO5drj9beA-1 X-Mimecast-MFC-AGG-ID: fWja6XeyMdqUfO5drj9beA_1763557740 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, alistair@alistair23.me, edgar.iglesias@gmail.com, npiggin@gmail.com, harshpb@linux.ibm.com, palmer@dabbelt.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, berrange@redhat.com, peterx@redhat.com, farosas@suse.de, eblake@redhat.com, vsementsov@yandex-team.ru, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, zhao1.liu@intel.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org Subject: [PATCH 1/5] hw/core/loader: Make load_elf_hdr() return bool, simplify caller Date: Wed, 19 Nov 2025 14:08:51 +0100 Message-ID: <20251119130855.105479-2-armbru@redhat.com> In-Reply-To: <20251119130855.105479-1-armbru@redhat.com> References: <20251119130855.105479-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763557775704158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Daniel Henrique Barboza Reviewed-by: Peter Xu Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy --- include/hw/loader.h | 4 +++- hw/arm/boot.c | 6 +----- hw/core/loader.c | 8 ++++++-- hw/riscv/spike.c | 10 +--------- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/include/hw/loader.h b/include/hw/loader.h index d035e72748..6f91703503 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -188,8 +188,10 @@ ssize_t load_elf(const char *filename, * * Inspect an ELF file's header. Read its full header contents into a * buffer and/or determine if the ELF is 64bit. + * + * Returns true on success, false on failure. */ -void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p); +bool load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p); =20 ssize_t load_aout(const char *filename, hwaddr addr, int max_sz, bool big_endian, hwaddr target_page_size); diff --git a/hw/arm/boot.c b/hw/arm/boot.c index b91660208f..06b303aab8 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -766,16 +766,12 @@ static ssize_t arm_load_elf(struct arm_boot_info *inf= o, uint64_t *pentry, int data_swab =3D 0; int elf_data_order; ssize_t ret; - Error *err =3D NULL; =20 - - load_elf_hdr(info->kernel_filename, &elf_header, &elf_is64, &err); - if (err) { + if (!load_elf_hdr(info->kernel_filename, &elf_header, &elf_is64, NULL)= ) { /* * If the file is not an ELF file we silently return. * The caller will fall back to try other formats. */ - error_free(err); return -1; } =20 diff --git a/hw/core/loader.c b/hw/core/loader.c index 590c5b02aa..10687fe1c8 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -364,8 +364,9 @@ const char *load_elf_strerror(ssize_t error) } } =20 -void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p) +bool load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p) { + bool ok =3D false; int fd; uint8_t e_ident_local[EI_NIDENT]; uint8_t *e_ident; @@ -380,7 +381,7 @@ void load_elf_hdr(const char *filename, void *hdr, bool= *is64, Error **errp) fd =3D open(filename, O_RDONLY | O_BINARY); if (fd < 0) { error_setg_errno(errp, errno, "Failed to open file: %s", filename); - return; + return false; } if (read(fd, hdr, EI_NIDENT) !=3D EI_NIDENT) { error_setg_errno(errp, errno, "Failed to read file: %s", filename); @@ -415,8 +416,11 @@ void load_elf_hdr(const char *filename, void *hdr, boo= l *is64, Error **errp) off +=3D br; } =20 + ok =3D true; + fail: close(fd); + return ok; } =20 /* return < 0 if error, otherwise the number of bytes loaded in memory */ diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index b0bab3fe00..8531e1d121 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -180,15 +180,7 @@ static void create_fdt(SpikeState *s, const MemMapEntr= y *memmap, =20 static bool spike_test_elf_image(char *filename) { - Error *err =3D NULL; - - load_elf_hdr(filename, NULL, NULL, &err); - if (err) { - error_free(err); - return false; - } else { - return true; - } + return load_elf_hdr(filename, NULL, NULL, NULL); } =20 static void spike_board_init(MachineState *machine) --=20 2.49.0 From nobody Thu Nov 20 12:28:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763557778; cv=none; d=zohomail.com; s=zohoarc; b=BRHPxwGNDrQb5jh/9yr1IXRbv6YjYLnfm4cA/cbQzaCa/3sWdpw6Tx2OroBUkwHFw37R0xF90sJIyvKAJbcfyKjrhRqN8BnR0iFNpoNEoTAcMYeN1SnwiDxP6snTA2Jw2sI8EQXOsPIwwsDtfZyw3jiJGAltAQXlCCxxW5dZ2/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763557778; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=k57r6YVNx8uUAT391iV07rPUraOx5YF9nTsOj6DrfB4=; b=PnSV6lomv1TXi4ZcUi8kzw4lIa2zDR1tKX2AdnRaG+/tvDjQ04h0IlC45rvhtsKnNGBZFoH8lAXJMbwbatC4y/oT1FJ11FOOoh5xNux6QC7ZBDLQndV7uwKpclbOG7B1lgGrYYkRLxjxqrlr1kC6Ogcypl227teaeIqb1Wu1WqI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763557778003845.941719667624; Wed, 19 Nov 2025 05:09:38 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1165962.1492653 (Exim 4.92) (envelope-from ) id 1vLhvu-0004bs-BN; Wed, 19 Nov 2025 13:09:14 +0000 Received: by outflank-mailman (output) from mailman id 1165962.1492653; Wed, 19 Nov 2025 13:09:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvu-0004bD-6y; Wed, 19 Nov 2025 13:09:14 +0000 Received: by outflank-mailman (input) for mailman id 1165962; Wed, 19 Nov 2025 13:09:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvs-0003iP-LP for xen-devel@lists.xenproject.org; Wed, 19 Nov 2025 13:09:12 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ef1b7b7f-c548-11f0-9d18-b5c5bf9af7f9; Wed, 19 Nov 2025 14:09:09 +0100 (CET) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-101-fS5PrNXsNZ2b5hmC7UdEAQ-1; Wed, 19 Nov 2025 08:09:03 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5B9A918AB40A; Wed, 19 Nov 2025 13:09:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 848921800361; Wed, 19 Nov 2025 13:08:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7F93A21E6742; Wed, 19 Nov 2025 14:08:55 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ef1b7b7f-c548-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763557748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k57r6YVNx8uUAT391iV07rPUraOx5YF9nTsOj6DrfB4=; b=Tt0TfMGE2AHPiugLQNMx9o5JoOf3aQAkcxFwHLOGjLA4MUpd3eqlYwJnC32cc5Xq9hPJ4f qosftrXN62d6I695YNv7cE82jTf0ESdVu+xbteI01eXXx9q0dVtLNfep9Fmle0+RKPA7hJ G7bDwgRoBkvvELmQXhKwgoGkR9bQP9M= X-MC-Unique: fS5PrNXsNZ2b5hmC7UdEAQ-1 X-Mimecast-MFC-AGG-ID: fS5PrNXsNZ2b5hmC7UdEAQ_1763557740 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, alistair@alistair23.me, edgar.iglesias@gmail.com, npiggin@gmail.com, harshpb@linux.ibm.com, palmer@dabbelt.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, berrange@redhat.com, peterx@redhat.com, farosas@suse.de, eblake@redhat.com, vsementsov@yandex-team.ru, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, zhao1.liu@intel.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org Subject: [PATCH 2/5] hw/nvram/xlnx-bbram: More idiomatic and simpler error reporting Date: Wed, 19 Nov 2025 14:08:52 +0100 Message-ID: <20251119130855.105479-3-armbru@redhat.com> In-Reply-To: <20251119130855.105479-1-armbru@redhat.com> References: <20251119130855.105479-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763557779750158500 Content-Type: text/plain; charset="utf-8" bbram_bdrv_error() interpolates a "detail" string into a template with error_setg_errno(), then reports the result with error_report(). Produces error messages with an unwanted '.': BLK-NAME: BBRAM backstore DETAIL failed.: STERROR Replace both calls of bbram_bdrv_error() by straightforward error_report(), and drop the function. This is less code, easier to read, and the error message is more greppable. Also delete the unwanted '.'. Signed-off-by: Markus Armbruster Reviewed-by: Luc Michel Reviewed-by: Peter Xu Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/nvram/xlnx-bbram.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 22aefbc240..fe289bad9d 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -88,18 +88,6 @@ static bool bbram_pgm_enabled(XlnxBBRam *s) return ARRAY_FIELD_EX32(s->regs, BBRAM_STATUS, PGM_MODE) !=3D 0; } =20 -static void bbram_bdrv_error(XlnxBBRam *s, int rc, gchar *detail) -{ - Error *errp =3D NULL; - - error_setg_errno(&errp, -rc, "%s: BBRAM backstore %s failed.", - blk_name(s->blk), detail); - error_report("%s", error_get_pretty(errp)); - error_free(errp); - - g_free(detail); -} - static void bbram_bdrv_read(XlnxBBRam *s, Error **errp) { uint32_t *ram =3D &s->regs[R_BBRAM_0]; @@ -162,7 +150,8 @@ static void bbram_bdrv_sync(XlnxBBRam *s, uint64_t hwad= dr) offset =3D hwaddr - A_BBRAM_0; rc =3D blk_pwrite(s->blk, offset, 4, &le32, 0); if (rc < 0) { - bbram_bdrv_error(s, rc, g_strdup_printf("write to offset %u", offs= et)); + error_report("%s: BBRAM backstore write to offset %u failed: %s", + blk_name(s->blk), offset, strerror(-rc)); } } =20 @@ -178,7 +167,8 @@ static void bbram_bdrv_zero(XlnxBBRam *s) =20 rc =3D blk_make_zero(s->blk, 0); if (rc < 0) { - bbram_bdrv_error(s, rc, g_strdup("zeroizing")); + error_report("%s: BBRAM backstore zeroizing failed: %s", + blk_name(s->blk), strerror(-rc)); } =20 /* Restore bbram8 if it is non-zero */ --=20 2.49.0 From nobody Thu Nov 20 12:28:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763557777; cv=none; d=zohomail.com; s=zohoarc; b=b/uUKkXwrWcLtS91bRgu6y3iUUbkq14WnbN5V0Cn25eJj/39A7RmWYIc9n3vvJunULm9a12lqH8wIc2wamnNf7UkF/uMDu50wqG+mP8kMeoZMDCBNCvGCc+etTReLAe4ZwPXebpwYXUWOEpqVfIW2p/YJJLfs1R70Eb/GxIe4Qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763557777; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Q2/KZiPL6jFf6ZEf6LuTfoZJ9VDQwSYmfYUw5h6FWj8=; b=EbNX+ci31cMGUN+OXwytHzYHVet96fIkUrL+sbdcWjg7vh1sf9aEX5TA1cF6RPWTr5yY0UU1jNly/UEjtqz+qbiIlKHnT4/JosY3xXEjpSEsa+Vhc60gru3qdSgTv1yA+S/FuaeXOylzCOsVUUXbvn5LtajWJK60yoo2QsWoUIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763557777799814.244061719636; Wed, 19 Nov 2025 05:09:37 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1165961.1492639 (Exim 4.92) (envelope-from ) id 1vLhvt-0004Dj-4J; Wed, 19 Nov 2025 13:09:13 +0000 Received: by outflank-mailman (output) from mailman id 1165961.1492639; Wed, 19 Nov 2025 13:09:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvs-0004DX-Uu; Wed, 19 Nov 2025 13:09:12 +0000 Received: by outflank-mailman (input) for mailman id 1165961; Wed, 19 Nov 2025 13:09:11 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvr-0003w5-KG for xen-devel@lists.xenproject.org; Wed, 19 Nov 2025 13:09:11 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ee9c0f27-c548-11f0-980a-7dc792cee155; Wed, 19 Nov 2025 14:09:08 +0100 (CET) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-151-AWehYKanNrqJKV5WNRli2g-1; Wed, 19 Nov 2025 08:09:04 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 664D91956096; Wed, 19 Nov 2025 13:09:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C6D3195608E; Wed, 19 Nov 2025 13:08:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 84D1321E66EF; Wed, 19 Nov 2025 14:08:55 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ee9c0f27-c548-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763557747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q2/KZiPL6jFf6ZEf6LuTfoZJ9VDQwSYmfYUw5h6FWj8=; b=d9jsWNs817ctZjQ2q7OG5AQdAQcwqVhcdYVpF+G+WzI+f42B55AFI6X2oaGbFLYKbxz7lg JywkaTCzc2VHpMhgAY0sPBoRW1BdCSgwXKcoF4HLkpBEk+hNhPKjEUMte4mcJ02mowrhlc lHWSxSZAVHBwM4b0uy1iGjjlX0CqO/U= X-MC-Unique: AWehYKanNrqJKV5WNRli2g-1 X-Mimecast-MFC-AGG-ID: AWehYKanNrqJKV5WNRli2g_1763557741 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, alistair@alistair23.me, edgar.iglesias@gmail.com, npiggin@gmail.com, harshpb@linux.ibm.com, palmer@dabbelt.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, berrange@redhat.com, peterx@redhat.com, farosas@suse.de, eblake@redhat.com, vsementsov@yandex-team.ru, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, zhao1.liu@intel.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org Subject: [PATCH 3/5] nbd/client-connection: Replace error_propagate() by assignment Date: Wed, 19 Nov 2025 14:08:53 +0100 Message-ID: <20251119130855.105479-4-armbru@redhat.com> In-Reply-To: <20251119130855.105479-1-armbru@redhat.com> References: <20251119130855.105479-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763557779729158500 Content-Type: text/plain; charset="utf-8" connect_thread_func() sets a variable to null, then error_propagate()s an Error * to it. This is a roundabout way to assign the Error * to it, so replace it by just that. Signed-off-by: Markus Armbruster Reviewed-by: Peter Xu Reviewed-by: Vladimir Sementsov-Ogievskiy --- nbd/client-connection.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nbd/client-connection.c b/nbd/client-connection.c index 79ea97e4cc..6a4f080717 100644 --- a/nbd/client-connection.c +++ b/nbd/client-connection.c @@ -207,8 +207,7 @@ static void *connect_thread_func(void *opaque) qemu_mutex_lock(&conn->mutex); =20 error_free(conn->err); - conn->err =3D NULL; - error_propagate(&conn->err, local_err); + conn->err =3D local_err; =20 if (ret < 0) { object_unref(OBJECT(conn->sioc)); --=20 2.49.0 From nobody Thu Nov 20 12:28:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763557782; cv=none; d=zohomail.com; s=zohoarc; b=U8JAKQb7BevW3SoYkWryuNms5KPGUX3Vfu1Sg0fYjnsQ+4DFHJLDLQqo1Z2Ryk1YcVhNyrhmNb8FEkDDjeaPVmj50l9MF/9R8gowm4plLWboTD/BTJm6UknfBlct/SYSNsWexv1m1blB6IsOLSyc5zpyPlw4Yw94BMHtMbeY9Ns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763557782; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tllD2ZsIo6gOfJev+IZeA8jqBYAlRgDihWUmymBakcU=; b=N9eU0xDzZFNyKuvr6WI6n5uzMFATNVmiedaweX78a4DmEE372gABpLd8bdpF14yEF88X8jX9qCx3BbQ080/noqX2GM3uRF05l/VTmYAFA3fs6xnTY4wZG+sNei8fsRrVDJMMc2Es66OjNF5b5HowFhKplwuL3xTEisMGTuLt1ck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763557782136570.3215361539199; Wed, 19 Nov 2025 05:09:42 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1165958.1492613 (Exim 4.92) (envelope-from ) id 1vLhvq-0003ic-78; Wed, 19 Nov 2025 13:09:10 +0000 Received: by outflank-mailman (output) from mailman id 1165958.1492613; Wed, 19 Nov 2025 13:09:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvq-0003iV-4F; Wed, 19 Nov 2025 13:09:10 +0000 Received: by outflank-mailman (input) for mailman id 1165958; Wed, 19 Nov 2025 13:09:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvo-0003iP-Iw for xen-devel@lists.xenproject.org; Wed, 19 Nov 2025 13:09:08 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ed5bf4fc-c548-11f0-9d18-b5c5bf9af7f9; Wed, 19 Nov 2025 14:09:07 +0100 (CET) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-xOlTkhEoOF61yJ6X7umJXA-1; Wed, 19 Nov 2025 08:09:04 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A0641800372; Wed, 19 Nov 2025 13:09:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F924300A88D; Wed, 19 Nov 2025 13:08:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 89E3A21E66F8; Wed, 19 Nov 2025 14:08:55 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ed5bf4fc-c548-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763557745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tllD2ZsIo6gOfJev+IZeA8jqBYAlRgDihWUmymBakcU=; b=eImq2/naRkM4GVvMhLR9EW9t3d4ojeKrjAR9ktSQ9fnP35GBKvo54p2Qnyk/UgxyryamI0 hTBaQ5WEk9JjRpbddN8is/DfdEGGgk8kEgdIvS7O4aVlZUg7oUrNyfjQAdCLVCvlXezAba R2kSN68YnCL13RQjhi2FDlj1UXo9ZF0= X-MC-Unique: xOlTkhEoOF61yJ6X7umJXA-1 X-Mimecast-MFC-AGG-ID: xOlTkhEoOF61yJ6X7umJXA_1763557741 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, alistair@alistair23.me, edgar.iglesias@gmail.com, npiggin@gmail.com, harshpb@linux.ibm.com, palmer@dabbelt.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, berrange@redhat.com, peterx@redhat.com, farosas@suse.de, eblake@redhat.com, vsementsov@yandex-team.ru, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, zhao1.liu@intel.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org Subject: [PATCH 4/5] error: error_free(NULL) is safe, drop unnecessary conditionals Date: Wed, 19 Nov 2025 14:08:54 +0100 Message-ID: <20251119130855.105479-5-armbru@redhat.com> In-Reply-To: <20251119130855.105479-1-armbru@redhat.com> References: <20251119130855.105479-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763557783959158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Acked-by: Peter Xu Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/acpi/pcihp.c | 4 +--- io/channel-websock.c | 4 +--- io/task.c | 4 +--- migration/migration.c | 6 ++---- tests/unit/test-smp-parse.c | 5 +---- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 4922bbc778..87162ff2c0 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -62,9 +62,7 @@ static int acpi_pcihp_get_bsel(PCIBus *bus) &local_err); =20 if (local_err || bsel >=3D ACPI_PCIHP_MAX_HOTPLUG_BUS) { - if (local_err) { - error_free(local_err); - } + error_free(local_err); return -1; } else { return bsel; diff --git a/io/channel-websock.c b/io/channel-websock.c index cb4dafdebb..d0929ba232 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -932,9 +932,7 @@ static void qio_channel_websock_finalize(Object *obj) if (ioc->io_tag) { g_source_remove(ioc->io_tag); } - if (ioc->io_err) { - error_free(ioc->io_err); - } + error_free(ioc->io_err); object_unref(OBJECT(ioc->master)); } =20 diff --git a/io/task.c b/io/task.c index 451f26f8b4..da79d31782 100644 --- a/io/task.c +++ b/io/task.c @@ -91,9 +91,7 @@ static void qio_task_free(QIOTask *task) if (task->destroyResult) { task->destroyResult(task->result); } - if (task->err) { - error_free(task->err); - } + error_free(task->err); object_unref(task->source); =20 qemu_mutex_unlock(&task->thread_lock); diff --git a/migration/migration.c b/migration/migration.c index c2daab6bdd..3160e24220 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1569,10 +1569,8 @@ bool migrate_has_error(MigrationState *s) static void migrate_error_free(MigrationState *s) { QEMU_LOCK_GUARD(&s->error_mutex); - if (s->error) { - error_free(s->error); - s->error =3D NULL; - } + error_free(s->error); + s->error =3D NULL; } =20 static void migration_connect_set_error(MigrationState *s, const Error *er= ror) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 326045ecbb..34082c1465 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -875,10 +875,7 @@ static void check_parse(MachineState *ms, const SMPCon= figuration *config, config_str, expect_err, output_topo_str); =20 end: - if (err !=3D NULL) { - error_free(err); - } - + error_free(err); abort(); } =20 --=20 2.49.0 From nobody Thu Nov 20 12:28:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763557775; cv=none; d=zohomail.com; s=zohoarc; b=jV5F+313MUI5278jKc//zCEIvLkxs4zrOg4+TNBVOtkvgD/7Y75WCp8Ufj5LKie0RzebQXV28sNuie8VzEr1r4AgrfL1Fuc8cGyjJfn7x4/iH73nr7kmOhK7xrUtRPM4qsvOx2FTA1JAQMBsTUjOJ6FA1KOjAg7x/Wy35qKBFDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763557775; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AWrrhvA/SQYaSu88z25wZQ2Z8oavREpawBAonXTqbBU=; b=RnGKAcRPvAKxAhEpN93jXaaaaD/iCPuVH/c5eBwZqpLOUvGYnSq7aIA8xlkaTg1mtChPWPyrEogJVDy5YP9JWoPFy69D2IWheL7EdiBQ/jZu35iXL5bEueWcGWEoaH1b5y1xjip2kTZrXfyLIfJOGmzDJa5AxB90FN0Q4Fggp/M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763557775651732.8008122085146; Wed, 19 Nov 2025 05:09:35 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1165963.1492663 (Exim 4.92) (envelope-from ) id 1vLhvx-0004vo-Lj; Wed, 19 Nov 2025 13:09:17 +0000 Received: by outflank-mailman (output) from mailman id 1165963.1492663; Wed, 19 Nov 2025 13:09:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvx-0004vf-Hz; Wed, 19 Nov 2025 13:09:17 +0000 Received: by outflank-mailman (input) for mailman id 1165963; Wed, 19 Nov 2025 13:09:16 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vLhvw-0003w5-Gs for xen-devel@lists.xenproject.org; Wed, 19 Nov 2025 13:09:16 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f1fd0a30-c548-11f0-980a-7dc792cee155; Wed, 19 Nov 2025 14:09:14 +0100 (CET) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-327-4l80z0zhO3KwJirOWaUm4g-1; Wed, 19 Nov 2025 08:09:07 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DD5B218AB410; Wed, 19 Nov 2025 13:09:03 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 17C931800346; Wed, 19 Nov 2025 13:09:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8F4A421E66A9; Wed, 19 Nov 2025 14:08:55 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f1fd0a30-c548-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763557753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AWrrhvA/SQYaSu88z25wZQ2Z8oavREpawBAonXTqbBU=; b=Z2QkO9d2OB5P73b1FJ/W/pbyqYnYWxaEmrg75mSgx11nyouOQJlUjTGXeXWvzN0LDbsddy VsWKpT1iL5j6DZ16xt1F8yKQih7ac8B3aq6oRCfMPFd7Is4eKIHlbjWjvtcHVsNk6RA+rY clc9lvzONz3Ee3ngptSzR2IqaAu29z8= X-MC-Unique: 4l80z0zhO3KwJirOWaUm4g-1 X-Mimecast-MFC-AGG-ID: 4l80z0zhO3KwJirOWaUm4g_1763557744 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, alistair@alistair23.me, edgar.iglesias@gmail.com, npiggin@gmail.com, harshpb@linux.ibm.com, palmer@dabbelt.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, berrange@redhat.com, peterx@redhat.com, farosas@suse.de, eblake@redhat.com, vsementsov@yandex-team.ru, eduardo@habkost.net, marcel.apfelbaum@gmail.com, philmd@linaro.org, wangyanan55@huawei.com, zhao1.liu@intel.com, qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org Subject: [PATCH 5/5] error: Consistently name Error * objects err, and not errp Date: Wed, 19 Nov 2025 14:08:55 +0100 Message-ID: <20251119130855.105479-6-armbru@redhat.com> In-Reply-To: <20251119130855.105479-1-armbru@redhat.com> References: <20251119130855.105479-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763557777871158500 Content-Type: text/plain; charset="utf-8" This touches code in xen_enable_tpm() that is obviously wrong. Since I don't know how to fix it properly, I'm adding a FIXME there. Signed-off-by: Markus Armbruster --- block/crypto.c | 8 ++++---- hw/acpi/ghes.c | 8 ++++---- hw/ppc/spapr.c | 16 ++++++++-------- hw/xen/xen-pvh-common.c | 13 ++++++++++--- nbd/common.c | 6 +++--- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index b97d027444..36abb7af46 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -938,14 +938,14 @@ static void GRAPH_RDLOCK block_crypto_amend_cleanup(BlockDriverState *bs) { BlockCrypto *crypto =3D bs->opaque; - Error *errp =3D NULL; + Error *err =3D NULL; =20 /* release exclusive read/write permissions to the underlying file */ crypto->updating_keys =3D false; - bdrv_child_refresh_perms(bs, bs->file, &errp); + bdrv_child_refresh_perms(bs, bs->file, &err); =20 - if (errp) { - error_report_err(errp); + if (err) { + error_report_err(err); } } =20 diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 06555905ce..841a36e370 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -563,7 +563,7 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_= t source_id, const uint8_t guid[] =3D UUID_LE(0xA5BC1114, 0x6F64, 0x4EDE, 0xB8, 0x63, 0x3E, 0x83, \ 0xED, 0x7C, 0x83, 0xB1); - Error *errp =3D NULL; + Error *err =3D NULL; int data_length; GArray *block; =20 @@ -583,12 +583,12 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint1= 6_t source_id, acpi_ghes_build_append_mem_cper(block, physical_address); =20 /* Report the error */ - ghes_record_cper_errors(ags, block->data, block->len, source_id, &errp= ); + ghes_record_cper_errors(ags, block->data, block->len, source_id, &err); =20 g_array_free(block, true); =20 - if (errp) { - error_report_err(errp); + if (err) { + error_report_err(err); return -1; } =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 99b843ba2f..db5e98e458 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2847,7 +2847,7 @@ static void spapr_machine_init(MachineState *machine) int i; MemoryRegion *sysmem =3D get_system_memory(); long load_limit, fw_size; - Error *errp =3D NULL; + Error *err =3D NULL; NICInfo *nd; =20 if (!filename) { @@ -2871,7 +2871,7 @@ static void spapr_machine_init(MachineState *machine) /* Determine capabilities to run with */ spapr_caps_init(spapr); =20 - kvmppc_check_papr_resize_hpt(&errp); + kvmppc_check_papr_resize_hpt(&err); if (spapr->resize_hpt =3D=3D SPAPR_RESIZE_HPT_DEFAULT) { /* * If the user explicitly requested a mode we should either @@ -2879,10 +2879,10 @@ static void spapr_machine_init(MachineState *machin= e) * it's not set explicitly, we reset our mode to something * that works */ - if (errp) { + if (err) { spapr->resize_hpt =3D SPAPR_RESIZE_HPT_DISABLED; - error_free(errp); - errp =3D NULL; + error_free(err); + err =3D NULL; } else { spapr->resize_hpt =3D smc->resize_hpt_default; } @@ -2890,14 +2890,14 @@ static void spapr_machine_init(MachineState *machin= e) =20 assert(spapr->resize_hpt !=3D SPAPR_RESIZE_HPT_DEFAULT); =20 - if ((spapr->resize_hpt !=3D SPAPR_RESIZE_HPT_DISABLED) && errp) { + if ((spapr->resize_hpt !=3D SPAPR_RESIZE_HPT_DISABLED) && err) { /* * User requested HPT resize, but this host can't supply it. Bail= out */ - error_report_err(errp); + error_report_err(err); exit(1); } - error_free(errp); + error_free(err); =20 spapr->rma_size =3D spapr_rma_size(spapr, &error_fatal); =20 diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c index b93ff80c85..3e62ec09d0 100644 --- a/hw/xen/xen-pvh-common.c +++ b/hw/xen/xen-pvh-common.c @@ -101,7 +101,7 @@ static void xen_create_virtio_mmio_devices(XenPVHMachin= eState *s) #ifdef CONFIG_TPM static void xen_enable_tpm(XenPVHMachineState *s) { - Error *errp =3D NULL; + Error *err =3D NULL; DeviceState *dev; SysBusDevice *busdev; =20 @@ -111,8 +111,15 @@ static void xen_enable_tpm(XenPVHMachineState *s) return; } dev =3D qdev_new(TYPE_TPM_TIS_SYSBUS); - object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp); - object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp); + /* + * FIXME This use of &err is is wrong. If both calls fail, the + * second will trip error_setv()'s assertion. If just one call + * fails, we leak an Error object. Setting the same property + * twice (first to a QOM path, then to an ID string) is almost + * certainly wrong, too. + */ + object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &err); + object_property_set_str(OBJECT(dev), "tpmdev", be->id, &err); busdev =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(busdev, &error_fatal); sysbus_mmio_map(busdev, 0, s->cfg.tpm.base); diff --git a/nbd/common.c b/nbd/common.c index 2a133a66c3..f43cbaa15b 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -282,10 +282,10 @@ void nbd_set_socket_send_buffer(QIOChannelSocket *sio= c) #ifdef UNIX_STREAM_SOCKET_SEND_BUFFER_SIZE if (sioc->localAddr.ss_family =3D=3D AF_UNIX) { size_t size =3D UNIX_STREAM_SOCKET_SEND_BUFFER_SIZE; - Error *errp =3D NULL; + Error *err =3D NULL; =20 - if (qio_channel_socket_set_send_buffer(sioc, size, &errp) < 0) { - warn_report_err(errp); + if (qio_channel_socket_set_send_buffer(sioc, size, &err) < 0) { + warn_report_err(err); } } #endif /* UNIX_STREAM_SOCKET_SEND_BUFFER_SIZE */ --=20 2.49.0