From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856445; cv=none; d=zohomail.com; s=zohoarc; b=Y7a9HK3qQbRTNjQbiRlMiVjRVzf3vk5ESLxW0EG0FCfeSRDF8LBgT10+S7KWp4tE+AWWyAB9vEjuzEeifjE/AWA2L8zZiEF5zzBiLmYtvzzaOP4LK24Yd9UMa7Wyk07K8kUv633hJrsJ64tYQDg1aa/czUI9Eu/VWyHHfFIcfVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856445; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bcl23ps/bK4EauZ2W48nVvpVqg5Y5Ps47IeSDNjIedc=; b=kvioAzi+ZhEzUSvFokVCw2MHU4OlqIx0xZhDPVLIPd4DZthYP+dO6B84R0U/ynGhgahnDzOsarJs6Ql+Wia3c8Dr+uvjvWo7y0A4s/VoMqHYvmvoIg4IypUaYCs3YTrh7Vgnz4vju5iOQ9KQpJmoUpcE7yNt/g8uDzvDK+OYNx8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856445447381.98218500800203; Wed, 7 Jan 2026 23:14:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6U-0006tu-KM; Thu, 08 Jan 2026 02:06:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6Q-0006kj-2X for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6M-0006bI-Nk for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 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-663-wbLIreZFM1W4nEQg2GwIag-1; Thu, 08 Jan 2026 02:06:30 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 373C21956094; Thu, 8 Jan 2026 07:06:29 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 59BC9180009E; Thu, 8 Jan 2026 07:06:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E8C1821E61A5; Thu, 08 Jan 2026 08:06:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855993; 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=Bcl23ps/bK4EauZ2W48nVvpVqg5Y5Ps47IeSDNjIedc=; b=hL1FSdZE61TiNjt/6U39Phak3LndEbEq6+JdWc4mjqRqYsDH4kcC+RCh8N8Dpc2+MYwrX0 WoSOnAm7QSt4VXoYJG+as3b+mx95t6Oiialvuh+1RlDiUyLNr0HX/UTizSx7LaVnPtVW+C gRt9PJgVkLx7Xsrr6p8Vrnav+N4h8Dc= X-MC-Unique: wbLIreZFM1W4nEQg2GwIag-1 X-Mimecast-MFC-AGG-ID: wbLIreZFM1W4nEQg2GwIag_1767855989 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Vladimir Sementsov-Ogievskiy , Peter Xu , Daniel Henrique Barboza , Zhao Liu Subject: [PULL v2 01/17] hw/core/loader: Make load_elf_hdr() return bool, simplify caller Date: Thu, 8 Jan 2026 08:06:09 +0100 Message-ID: <20260108070625.1586474-2-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-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 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856446592158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-ID: <20251119130855.105479-2-armbru@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu Reviewed-by: Daniel Henrique Barboza Reviewed-by: Zhao Liu --- include/hw/core/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/core/loader.h b/include/hw/core/loader.h index d035e72748..6f91703503 100644 --- a/include/hw/core/loader.h +++ b/include/hw/core/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 0ba3adaf81..e22609de93 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 8252616fdd..89d67d2760 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 1493b928da..35c696f891 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.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856499; cv=none; d=zohomail.com; s=zohoarc; b=jjnolKzlcd9D7fmTqCVjnfHsvyA1I7sm9XBzi6LfjIytLgQvMuozlxK3Ko1xwh4wtg27wqCJDBJOL1gLSEoXk3FpmnjFTalZRIDRlgSiwwLxs280DgD/JoLZU1tyDIvOGof24xv/FwM/gMgBoPlo8knbzkUc9FBur6pD5Fzh3Dc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856499; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Y4a0cYuav1Vio+9dWkD0CtDvJQ580nj+0sRoB4k30nI=; b=JZdCp68r9ndbz5JDp9wGoZwjPZm98Fxu7VBahqYbkzHKDE85wLtrtuMnktkpgWkx6SYn/RMfr88K8e9oBfl0anl7vNbbEELFOAJ+XdS6KkauXY13sPzfUM9BSU1bCUOX2uTmk1n9q3tGJxD59cxqdxTiJf2cpl3fY1o629bb56U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856499968680.3523817575879; Wed, 7 Jan 2026 23:14:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6T-0006pH-S1; Thu, 08 Jan 2026 02:06:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6O-0006jk-MV for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6M-0006bF-Mz for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:36 -0500 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-605-MDFkAb8xO22CTG87E0UIKw-1; Thu, 08 Jan 2026 02:06:30 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2E01419560B2; Thu, 8 Jan 2026 07:06:29 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E89130002D1; Thu, 8 Jan 2026 07:06:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ED37821E61A8; Thu, 08 Jan 2026 08:06:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855993; 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=Y4a0cYuav1Vio+9dWkD0CtDvJQ580nj+0sRoB4k30nI=; b=AQUB2ZyHc5Xuzhg3hLfNvCo2Q6ZpkOgpyWD8vxxZiBV6glrvC0OgCiBHYtwOCuB02gRYBb tbbVE+vqxxpDcBudq7M86pE0F4PAE7mH2/npRcfbVLh+Nho9t6j7KR+qHFEts3FXL47+xY /lOP2Nw+TZ2XykcuvucguEGMtSVZiag= X-MC-Unique: MDFkAb8xO22CTG87E0UIKw-1 X-Mimecast-MFC-AGG-ID: MDFkAb8xO22CTG87E0UIKw_1767855989 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Vladimir Sementsov-Ogievskiy , Peter Xu , Luc Michel , Zhao Liu Subject: [PULL v2 02/17] hw/nvram/xlnx-bbram: More idiomatic and simpler error reporting Date: Thu, 8 Jan 2026 08:06:10 +0100 Message-ID: <20260108070625.1586474-3-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-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 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856502251158500 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 Message-ID: <20251119130855.105479-3-armbru@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu Reviewed-by: Luc Michel Reviewed-by: Zhao Liu --- 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 60ede7e40f..edfb592a5e 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.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856521; cv=none; d=zohomail.com; s=zohoarc; b=JAfbsbhLSFA40c6hLl6jkv3yxcTu+x41tTQtELMW8tn7Ki/+vcwnYWmMSMV7BWUMXe9LNtn1mxaTIibD8XXvWTvaidOijdWUXjMLcaozrVEbLcJ9EffZoxe8KCxJGrpdthd7NS/AuermJEcsB4mWuUIXFOM5pbMoOeTF3441w5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856521; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2eQIJicwswPhegRn6v45nU97TjUCKBDRACnnAImYw58=; b=HSdIKygbvIJmC6WrrRC0sWJaYV4bkbP37rYYDTp9g985DFaXLtmRai9Ynhcd+9v92q8Sp55dOs1Ic2jApDrEzeB1dsskin2Bcjt1HTEoAemeQOweDeDVULLaCzAAvstHMyDm/E80+AABxmkzpdicKM8pIk0TmJSiRAiZWzXWY1k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856521020575.2521797311605; Wed, 7 Jan 2026 23:15:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6T-0006pL-W6; Thu, 08 Jan 2026 02:06:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6P-0006jp-TL for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6M-0006b4-Tf for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 Received: from mx-prod-mc-01.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-663-1WxZxIwaMTSYFETUYQUPmw-1; Thu, 08 Jan 2026 02:06:30 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1F0311954204; Thu, 8 Jan 2026 07:06:29 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 74C951800980; Thu, 8 Jan 2026 07:06:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F160A21E61A9; Thu, 08 Jan 2026 08:06:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855992; 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=2eQIJicwswPhegRn6v45nU97TjUCKBDRACnnAImYw58=; b=GE3khjzVyUoDHzN0qbwXvWMm6ie89e0zGsGBEpcAIRHMFWzi886VzdtTLAKkIG3HDuV8Vq ek/+PnsXveTtHZRoLYhd4dhz9hNzIwQmwNsVoqoi6u9NRaltUGxd+WEYW4YsYGP4ag05Y8 9GjG5pWW6mB12p8WpKY4H5Y6yJkGw4k= X-MC-Unique: 1WxZxIwaMTSYFETUYQUPmw-1 X-Mimecast-MFC-AGG-ID: 1WxZxIwaMTSYFETUYQUPmw_1767855989 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Vladimir Sementsov-Ogievskiy , Peter Xu , Zhao Liu Subject: [PULL v2 03/17] nbd/client-connection: Replace error_propagate() by assignment Date: Thu, 8 Jan 2026 08:06:11 +0100 Message-ID: <20260108070625.1586474-4-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-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 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856522334158500 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 Message-ID: <20251119130855.105479-4-armbru@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu Reviewed-by: Zhao Liu --- 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.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856627; cv=none; d=zohomail.com; s=zohoarc; b=d94K7s3Z1D1ASfvqExigKNP1N/qbYAX7c2Yuh7xKJ+sfO7g9VxFkmGS8eexBCyAPv4JlfQiVl8XtcmGmUc2CqAtSABRqnW/pPeJzoYidBzdy4rlECO83WqoGLK6J1BjAG31ri4LRy9631b1Fs7OedQDz1eMfIHVrxwezDA34GBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856627; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oQeg/ax1yqZCNF/kck2njGvRd7LL1zM9VleD8rDKBvQ=; b=SWalBt3P2XiFHS9SXRvYH+Y75d565RucdKFU/+/C+JJ05/KPgX9Q86qBZxOE16ig3XZ9M3zt+0F4oz5a3CfQpOKiq6L30gQ4NTIQ+xx4q+BuYhIc9GADlI+KgPcJSiSzWuzbwMXDr100VAaQnw9KXhC/zFeDuZXwNaAj89jflZA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856627273737.0855528402335; Wed, 7 Jan 2026 23:17:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6W-0006y3-3h; Thu, 08 Jan 2026 02:06:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6O-0006ji-If for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6M-0006bD-NN for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:36 -0500 Received: from mx-prod-mc-06.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-663-YvstIR5oNM6emDUB6PUhBQ-1; Thu, 08 Jan 2026 02:06:30 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4204318005AF; Thu, 8 Jan 2026 07:06:29 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7248819560A7; Thu, 8 Jan 2026 07:06:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0176421E61AA; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855993; 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=oQeg/ax1yqZCNF/kck2njGvRd7LL1zM9VleD8rDKBvQ=; b=PHckq3FLK6YqHPh6TWKcBAxpsREfhkhRHCmu+lSppfD1oYF4Jl5k7qsR0Os6aLlATLPbvJ sACyL6k2CTxDjj4uccvgbXVY5Gpu6RqA4rvOEfYwyTI/1e1WBfyLI+d8PPAPgAg4+Xcu+j cQR5ZBgl0mQLMjBuAbNBY8f219ncgMM= X-MC-Unique: YvstIR5oNM6emDUB6PUhBQ-1 X-Mimecast-MFC-AGG-ID: YvstIR5oNM6emDUB6PUhBQ_1767855989 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Vladimir Sementsov-Ogievskiy , Peter Xu , Zhao Liu Subject: [PULL v2 04/17] error: error_free(NULL) is safe, drop unnecessary conditionals Date: Thu, 8 Jan 2026 08:06:12 +0100 Message-ID: <20260108070625.1586474-5-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856629246158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-ID: <20251119130855.105479-5-armbru@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu Reviewed-by: Zhao Liu --- 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 9d1bf5d276..1c34d8d432 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1568,10 +1568,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_error_propagate(MigrationState *s, Error *er= ror) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 28ea9158e7..1b6450e7d8 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.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856656; cv=none; d=zohomail.com; s=zohoarc; b=ECDM1Tw7qI7SJ+/JRhbOiXnlKUBGYE8SBgvmomhCSWlCEDf2BaVaKlsDmKVijs570tKZYhJjD3xh52UlEIo8N7vI1qpC763OSAJJ5XPL/zi/sWSfzHR5JP8wNnZgyyOTHcH5d/0EQDAzkWuGjSFaiFMfchTtJvVq1W7FV8L4h90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856656; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qkfNWyL3vVuiztaDBd6iakYD+1JHNCPUXMngEiTpW8k=; b=bFNLf1Os+4951ibGZ/fUsIkcGMv1M2vsvF68+EZgMqZnLrl26IQmPRxwHu0jY5RYocYCkDpdSRVtjxKtDfadN1epbb3rGen3h+ziljL0Ig8Nfh2aJpU4EK0VfPyVN5f43LSqz6WTg+Vy3ql8JExRMW/SpUrlGbUeGWRCUErlytU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856656592419.5981637837965; Wed, 7 Jan 2026 23:17:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6V-0006uu-F4; Thu, 08 Jan 2026 02:06:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6R-0006mp-DX for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6O-0006bc-Fd for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 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-264-EkExeb0nOFK6naMFQhq8VQ-1; Thu, 08 Jan 2026 02:06:33 -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 87CB719560B5; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0481718001D5; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 058B621E61AD; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855995; 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=qkfNWyL3vVuiztaDBd6iakYD+1JHNCPUXMngEiTpW8k=; b=c/V4wfSbVb/HT/UcQXMAQKE2mME9ZgcH6HZk6JtpLaqVrvK11pIL9ySqnOg0ke1EulPAAd H1zbPu7jE3v2ldZnHRnwQGTMGlZfsubGY+AleyWohOtwpM90eYdyCpJPJoeSrtXzVxfYRz pshKCls4dj7Q9ApdS6FQrsg/rRnClHA= X-MC-Unique: EkExeb0nOFK6naMFQhq8VQ-1 X-Mimecast-MFC-AGG-ID: EkExeb0nOFK6naMFQhq8VQ_1767855991 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Zhao Liu Subject: [PULL v2 05/17] error: Consistently name Error * objects err, and not errp Date: Thu, 8 Jan 2026 08:06:13 +0100 Message-ID: <20260108070625.1586474-6-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-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 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 (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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856656976158500 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 Message-ID: <20251119130855.105479-6-armbru@redhat.com> Reviewed-by: Zhao Liu --- 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 365156dff9..5445dc11bd 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -564,7 +564,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 @@ -584,12 +584,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 bcf6aa560f..b3c5097bf8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2848,7 +2848,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) { @@ -2872,7 +2872,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 @@ -2880,10 +2880,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; } @@ -2891,14 +2891,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 f365222019..1381310fc7 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.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856533; cv=none; d=zohomail.com; s=zohoarc; b=lk2/w9fLZoWmZSaLAhTocP6zs3SRmIiMP3fzCf5WNmETM6e/UzIO7xFF9Eu72IDVmpEvpLceW9+8MIQvXygRjMJrvoaU9h22gIQRTRMSlwOKS7WZYGznjB9CYmvJi7kx3yS5Cc7A5HVeFV63mZNBWgMjwuTVFOn3Dwm8cOLtc30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856533; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yeKFGZB9+gJSq195IaW/Pt1I2thdpGCpcsFHPG8zrPU=; b=e/k1tFeMK0R9Fl/r0Kaq9YMTO2dn9CfOKk2vS2jnUaGhyBOoSgsXVARrUdFqx2TDtpVc9l00812exvgbhg69GH8Dgst9tGdg86C1undmmo4dUIBt1hnvgPXfv/E7aFTYRbWhQ5Y6q2XlcfxysOhtGYpcMWJrFmuhls1qUog47ws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856533220206.45007421036996; Wed, 7 Jan 2026 23:15:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6W-0006zn-Gl; Thu, 08 Jan 2026 02:06:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6S-0006p7-8u for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6P-0006c7-Nd for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:40 -0500 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-264-VrUDGTsqNnqU1RaVc4S0FQ-1; Thu, 08 Jan 2026 02:06:33 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 80083195609E; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3BBFD19560A7; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 096CE21E61AE; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yeKFGZB9+gJSq195IaW/Pt1I2thdpGCpcsFHPG8zrPU=; b=Svrw/Th9xnZLBhgvQXGBtfCPExeXiFEwgPYkV0bPMDWNj0rI+DJ2pdYVfWAOuFEqdDtBuA tJq4Ir7zVXMkcNC77y0Fg8fryfpN6bUku4SxKGmD4SUYLOgqVvuS7lSbK7DGR0oC6xIwJB Y558cyBgPtfmCW9uQg0cUvKjl3lJ9/Y= X-MC-Unique: VrUDGTsqNnqU1RaVc4S0FQ-1 X-Mimecast-MFC-AGG-ID: VrUDGTsqNnqU1RaVc4S0FQ_1767855991 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 06/17] error: Strip trailing '\n' from error string arguments (again) Date: Thu, 8 Jan 2026 08:06:14 +0100 Message-ID: <20260108070625.1586474-7-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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 (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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856534370158500 Tracked down with scripts/coccinelle/err-bad-newline.cocci. Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-2-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/es1370.c | 2 +- ui/gtk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 9873ffadab..566f93f1ea 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -228,7 +228,7 @@ static void print_sctl(uint32_t val) #undef a error_report("es1370: " "%s p2_end_inc %d, p2_st_inc %d," - " r1_fmt %s, p2_fmt %s, p1_fmt %s\n", + " r1_fmt %s, p2_fmt %s, p1_fmt %s", buf, (val & SCTRL_P2ENDINC) >> SCTRL_SH_P2ENDINC, (val & SCTRL_P2STINC) >> SCTRL_SH_P2STINC, diff --git a/ui/gtk.c b/ui/gtk.c index 48571bedbf..e83a366625 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1197,7 +1197,7 @@ static gboolean gd_touch_event(GtkWidget *widget, Gdk= EventTouch *touch, type =3D INPUT_MULTI_TOUCH_TYPE_END; break; default: - warn_report("gtk: unexpected touch event type\n"); + warn_report("gtk: unexpected touch event type"); return FALSE; } =20 --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856257; cv=none; d=zohomail.com; s=zohoarc; b=kMEPOkPX78cVMNZYH0omtz3n6cQZ5f/SesTP9qn6wWxj2OoztyrEDfQsJYXqf9OBUdl+eDV0uzF9r7m9BtxI8P124D0scbzvzfNahdzq6yG69uGIh2J9xXN7rPAXKcn5VFWz+BPXc1o+IDlM5iQnQH0Ab6OLMvSn3dfqvfHdD2A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856257; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gmvPlwKEeCyvXjYhqrp6IAqZIl+goYekY4R4ZTuUKtY=; b=HiZ2ZlbGQv+oU174xNMnpA4TalJ6+Hv4iAyaGANKJQZks1duYveryybG//Tyv4xr7b1gC2ya/H3WosE8ut1tCwyYUd6MPQzr/D9/SwK4bkkxeJHG7kGT5lmR3SFlR2FBpfwwUa6ppqs+Pzu3ScIcDR4c0kyyQlsbU007IMiq2+I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856257926477.7567131603952; Wed, 7 Jan 2026 23:10:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6U-0006tf-IX; Thu, 08 Jan 2026 02:06:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6Q-0006k6-0i for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6N-0006bU-Mp for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 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-300-OuwCuNx4P7qGiSzdzYRVYA-1; Thu, 08 Jan 2026 02:06:32 -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 039131956061; Thu, 8 Jan 2026 07:06:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9CABB1801ACA; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0D1E021E61B2; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855995; 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=gmvPlwKEeCyvXjYhqrp6IAqZIl+goYekY4R4ZTuUKtY=; b=I02CCsnO0NSY+9lD6JeC5V1bNVOx1sWiDxS9XV4PQbacCPhMxShxe2f6otdmpX2qBcLroA CPOa2j2+3sqi3IWHi4M6+GT3ujET/ap+cQKYedSOdYMswBr40olj0Kt/jgIy5hTRo8T8Ha u/i1QOvdckKon/4nrDo7Rti35R41H3c= X-MC-Unique: OuwCuNx4P7qGiSzdzYRVYA-1 X-Mimecast-MFC-AGG-ID: OuwCuNx4P7qGiSzdzYRVYA_1767855992 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org Subject: [PULL v2 07/17] ui: Convert to qemu_create() for simplicity and consistency Date: Thu, 8 Jan 2026 08:06:15 +0100 Message-ID: <20260108070625.1586474-8-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-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 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 (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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856259229158500 Content-Type: text/plain; charset="utf-8" The error message changes from failed to open file 'FILENAME': REASON to Could not create 'FILENAME': REASON Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-4-armbru@redhat.com> --- ui/ui-qmp-cmds.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c index 74fa6c6ec5..b49b636152 100644 --- a/ui/ui-qmp-cmds.c +++ b/ui/ui-qmp-cmds.c @@ -369,10 +369,8 @@ qmp_screendump(const char *filename, const char *devic= e, } image =3D pixman_image_ref(surface->image); =20 - fd =3D qemu_open_old(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY= , 0666); + fd =3D qemu_create(filename, O_WRONLY | O_TRUNC | O_BINARY, 0666, errp= ); if (fd =3D=3D -1) { - error_setg(errp, "failed to open file '%s': %s", filename, - strerror(errno)); return; } =20 --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856554; cv=none; d=zohomail.com; s=zohoarc; b=LTV30QAH0QK58UjNEMQSqfpLGNYZh33CTCTm9xcPzLZYYAzrnfX2sJW+vkC9VIS05q2/3C2tvRYDVN/DuS3S1QOWolMxp5HXqBZWKQgCBEMRuI7pwhtI5ZUBP8mi/rGglsCs0LOEMnU5vrDsGIKY0SX5/IKVJ6N1fiutQLaIFJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856554; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gONgRn/GNyBGob63kNT426dkqmiq4qN/s3arf4kHFSI=; b=ROk/pVbtg4jXJM0dYFF6LQSrTrLjUQFQMbWMJSXAHsIuxG6Kj224MHBeU44+WmTcxnu+bX6upFdrvphpVilYdHV8mORKu27zGUGQm2QyOxU21f47cgDshNz2Pd5elrg7X/qhYcMD1hh1Q2Mi/s4YCoVbcxyz9tUrqq+tdSD0Ytk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17678565543901019.1584699006485; Wed, 7 Jan 2026 23:15:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6b-0007JO-Sv; Thu, 08 Jan 2026 02:06:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6S-0006pK-Io for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6Q-0006ce-Jm for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:40 -0500 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-665--y-M8g2NMHOywAafuALT4Q-1; Thu, 08 Jan 2026 02:06:33 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 20614180035D; Thu, 8 Jan 2026 07:06:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AA00218008FF; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 10FB521E61B3; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gONgRn/GNyBGob63kNT426dkqmiq4qN/s3arf4kHFSI=; b=akTONvq8px2J7Hnt/UOZLcXsPr5fCcWWIMgaJmQq2L59DDuvD4yAyr4zuW3xj6lUwenvAf fB9gKMxyTMckOj4S3xKwRCQeNrj0DQOTUpnSxQtws+N6NYYaKd4kp7JQ5mLOfxlRkX/lkd z2yrJ1x1AMJ+XCc6RPoqgarx0r4+Hvk= X-MC-Unique: -y-M8g2NMHOywAafuALT4Q-1 X-Mimecast-MFC-AGG-ID: -y-M8g2NMHOywAafuALT4Q_1767855992 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, "Dr. David Alan Gilbert" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 08/17] tap-solaris: Use error_setg_file_open() for better error messages Date: Thu, 8 Jan 2026 08:06:16 +0100 Message-ID: <20260108070625.1586474-9-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856556526158500 Error messages change from Can't open /dev/ip (actually /dev/udp) Can't open /dev/tap Can't open /dev/tap (2) to Could not open '/dev/udp': REASON Could not open '/dev/tap': REASON where REASON is the value of strerror(errno). Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Message-ID: <20251121121438.1249498-5-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/tap-solaris.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 75397e6c54..faf7922ea8 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -87,13 +87,13 @@ static int tap_alloc(char *dev, size_t dev_size, Error = **errp) =20 ip_fd =3D RETRY_ON_EINTR(open("/dev/udp", O_RDWR, 0)); if (ip_fd < 0) { - error_setg(errp, "Can't open /dev/ip (actually /dev/udp)"); + error_setg_file_open(errp, errno, "/dev/udp"); return -1; } =20 tap_fd =3D RETRY_ON_EINTR(open("/dev/tap", O_RDWR, 0)); if (tap_fd < 0) { - error_setg(errp, "Can't open /dev/tap"); + error_setg_file_open(errp, errno, "/dev/tap"); return -1; } =20 @@ -107,7 +107,7 @@ static int tap_alloc(char *dev, size_t dev_size, Error = **errp) =20 if_fd =3D RETRY_ON_EINTR(open("/dev/tap", O_RDWR, 0)); if (if_fd < 0) { - error_setg(errp, "Can't open /dev/tap (2)"); + error_setg_file_open(errp, errno, "/dev/tap"); return -1; } if(ioctl(if_fd, I_PUSH, "ip") < 0){ --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856656; cv=none; d=zohomail.com; s=zohoarc; b=nuWmNkbZHuKC4vlmYLSYal1KXTGT+GRCx2q0FoHoWHbYyIitktqkbmUWZ54++JwWvC8bKFmmeKehkdQtDtjSh1EkNX0LxTW5j/eWmHPOk8DzVZrsc426Dc1AFamrMc0Je6sUojyu6UG8OuMhGhGXPxwT25YgIDL1I6ij2vGHJzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856656; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5rBT0wM/0nCOtv8moP8RiQX1LfyxaSmtC3iGS80HRSU=; b=fCF7S7KcfuIH9YVsFJgqwZW7DZwmYHWMrN8VkBBDl+qnO3atfPpv3z/LISczgv5+0jx1bfzcdvGnu7xiIFQMC+uE91NwhE1S1I3Na8jcPjP+28CAim9z7J52Cp1u7x8W4pqjbL0S0Zaq+3ovBy7Br3yMRr68KlkAD50C3ZAKcmM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856656445605.5145327225448; Wed, 7 Jan 2026 23:17:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6V-0006up-AF; Thu, 08 Jan 2026 02:06:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6R-0006mR-AJ for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6O-0006bk-SV for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 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-441-mcXG55-WNfOiC5_Cnq892A-1; Thu, 08 Jan 2026 02:06:32 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C280B1956080; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 73FB830002D2; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 14ECB21E61B5; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855996; 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=5rBT0wM/0nCOtv8moP8RiQX1LfyxaSmtC3iGS80HRSU=; b=WtitmyUvUHqqVCFnDX7qigs8lrlEguT6JM0v8XOBLQnp2cMnhRhEmKPV8mGSrxEeJJEumq uU/zfR16FHl3AKGPhROA5j0kgwYQL6/Hm0tu/sPdMsItTEb9dYXjhLZqyh4yb5BUaEGPZG QCQt5BBjf9Q2Xx+71mTAIcQlF8TlfFI= X-MC-Unique: mcXG55-WNfOiC5_Cnq892A-1 X-Mimecast-MFC-AGG-ID: mcXG55-WNfOiC5_Cnq892A_1767855992 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, "Dr. David Alan Gilbert" , Kostiantyn Kostiuk Subject: [PULL v2 09/17] qga: Use error_setg_file_open() for better error messages Date: Thu, 8 Jan 2026 08:06:17 +0100 Message-ID: <20260108070625.1586474-10-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-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 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856656891158500 Content-Type: text/plain; charset="utf-8" Error messages change from open("FNAME"): REASON to Could not open 'FNAME': REASON Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Kostiantyn Kostiuk Message-ID: <20251121121438.1249498-6-armbru@redhat.com> --- qga/commands-linux.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index c639a60a94..ae2c4d442a 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -1503,14 +1503,15 @@ static void transfer_vcpu(GuestLogicalProcessor *vc= pu, bool sys2vcpu, =20 dirfd =3D open(dirpath, O_RDONLY | O_DIRECTORY); if (dirfd =3D=3D -1) { - error_setg_errno(errp, errno, "open(\"%s\")", dirpath); + error_setg_file_open(errp, errno, dirpath); return; } =20 fd =3D openat(dirfd, fn, sys2vcpu ? O_RDONLY : O_RDWR); if (fd =3D=3D -1) { if (errno !=3D ENOENT) { - error_setg_errno(errp, errno, "open(\"%s/%s\")", dirpath, fn); + error_setg_errno(errp, errno, "could not open %s/%s", + dirpath, fn); } else if (sys2vcpu) { vcpu->online =3D true; vcpu->can_offline =3D false; @@ -1712,7 +1713,7 @@ static void transfer_memory_block(GuestMemoryBlock *m= em_blk, bool sys2memblk, dirfd =3D open(dirpath, O_RDONLY | O_DIRECTORY); if (dirfd =3D=3D -1) { if (sys2memblk) { - error_setg_errno(errp, errno, "open(\"%s\")", dirpath); + error_setg_file_open(errp, errno, dirpath); } else { if (errno =3D=3D ENOENT) { result->response =3D GUEST_MEMORY_BLOCK_RESPONSE_TYPE_NOT_= FOUND; @@ -1937,7 +1938,7 @@ static GuestDiskStatsInfoList *guest_get_diskstats(Er= ror **errp) =20 fp =3D fopen(diskstats, "r"); if (fp =3D=3D NULL) { - error_setg_errno(errp, errno, "open(\"%s\")", diskstats); + error_setg_file_open(errp, errno, diskstats); return NULL; } =20 @@ -2048,7 +2049,7 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **err= p) =20 fp =3D fopen(cpustats, "r"); if (fp =3D=3D NULL) { - error_setg_errno(errp, errno, "open(\"%s\")", cpustats); + error_setg_file_open(errp, errno, cpustats); return NULL; } =20 --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856232; cv=none; d=zohomail.com; s=zohoarc; b=e5QRpE8kDo1idgask6zX0aZUKQUN2sUBNKTyin3E99SMcRJovCsZYSwQ/vbmwGnkjLI+nt5xAoB4sG9+/4NpCxi5Kqiyj4g7snqd6hGSUr8G5dcZivjmkC9pvGG+F6XP3SaGm4UbxgEsycwpyXAPVm+E5TsvJ9R8dxRzLZ+nWvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856232; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=keBXidDCLkwGrt3l6TpJ6ATfVbhpZVBVBE23uCa133Y=; b=S+qphRKTVSlq8/3BkSCyDaK9aeo3XvLMo4cbaKsGF44TeZv+mDMoaeh292//vCjMlou/9dzgaZtCWQrDROaSnFFVrZ8oLQIyQgyIBObbHglyJrit7s0Dv69iD6HQYY/UhOxLhgsPpGKMlhbTrGi7s8miC/yeBEBlfuTfKU4b5lU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856232755828.8720261489963; Wed, 7 Jan 2026 23:10:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6U-0006tv-MV; Thu, 08 Jan 2026 02:06:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6P-0006jo-TF for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6N-0006bQ-9m for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:37 -0500 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-441-aaTJD16qOnm2En34sLaKnw-1; Thu, 08 Jan 2026 02:06:32 -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 E2966195605B; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A17141801ACC; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 18D9521E61B7; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=keBXidDCLkwGrt3l6TpJ6ATfVbhpZVBVBE23uCa133Y=; b=Wut0LI8lY+GdnXp1GScDrxCDwO9aRu9gxBU9HEldnDUGLMgogNrVWIcnFAeU9VdfszKQ93 RhduL3804y/dnzrtrnKJyalZS5xcmiDbS8rg+I+mqBAWdvxs2SS7H+jGA3SP4EPvsUonYE 61HsF8u7OqlwZn5m1MP1nqYnsLbGS0c= X-MC-Unique: aaTJD16qOnm2En34sLaKnw-1 X-Mimecast-MFC-AGG-ID: aaTJD16qOnm2En34sLaKnw_1767855992 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 10/17] net/tap: Use error_setg_file_open() for a better error message Date: Thu, 8 Jan 2026 08:06:18 +0100 Message-ID: <20260108070625.1586474-11-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856235090158500 The error message changes from tap: open vhost char device failed to Could not open '/dev/vhost-net': REASON I think the exact file name is more useful to know than the file's purpose. We could put back the "tap: " prefix with error_prepend(). Not worth the bother. Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-9-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/tap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/tap.c b/net/tap.c index abe3b2d036..bfba3fd7a7 100644 --- a/net/tap.c +++ b/net/tap.c @@ -747,8 +747,7 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, } else { vhostfd =3D open("/dev/vhost-net", O_RDWR); if (vhostfd < 0) { - error_setg_errno(errp, errno, - "tap: open vhost char device failed"); + error_setg_file_open(errp, errno, "/dev/vhost-net"); goto failed; } if (!qemu_set_blocking(vhostfd, false, errp)) { --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856501; cv=none; d=zohomail.com; s=zohoarc; b=XHtTQNkx2y/nJrwoD+AjEPYohPItiACL2F4em3lWZ0qhNhB9A9aG0C7sr2VOZ27vPsZHd71I10Zu1KwqlzHZwP+M9mKqv19B4JrBEK4SeDihgJw7k2a9Uch9w15TkBUHbHg7FIHSTnfqsipsPqQZxLbIyAk37DCzfWpev8T5aks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856501; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+24QtW0IOqJ/TCWGYCOGIexrTZX+Dhgygc6Vsp4mfbI=; b=hU30qlWKh4e2hCBYEKkmB38IEQaEgPGzwlgWC1JBEqMrWFNaGC3uIGko6HRpxb+NI2CjwlV2wSX+gVkTCnrPP4qu9PY0iVABwTOyyDOIDEYqYdcb1ExMqZYcNej3QmJZ1BLjZEBrm4RYisUsyT5N/KnxsMz+j3IGR7s1trMsonY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856501792913.2819453970642; Wed, 7 Jan 2026 23:15:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6b-0007Ii-KF; Thu, 08 Jan 2026 02:06:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6R-0006lq-4l for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6O-0006bi-Ot for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:38 -0500 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-644-C-2G9KHQNLWrF1bFNojqCw-1; Thu, 08 Jan 2026 02:06:32 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 CD51C1800473; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8E06619560A7; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1CBBA21E61B8; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855996; 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=+24QtW0IOqJ/TCWGYCOGIexrTZX+Dhgygc6Vsp4mfbI=; b=VUYs2QHuqasHcI/PA+wZ4NlTJwjqRfdNY7jR82nl1u0Nf6+8ydyvOQaXiD4D4VmdB8E8tt hd1aVBYhMCmrKwInOCHfEL09sKtNF64yOJcY+AFgLGE21UOUzXx2DuYvM42geCigsutUMU x761A+vdYyOsviuvkY2K14eu0pK045k= X-MC-Unique: C-2G9KHQNLWrF1bFNojqCw-1 X-Mimecast-MFC-AGG-ID: C-2G9KHQNLWrF1bFNojqCw_1767855991 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org Subject: [PULL v2 11/17] blkdebug: Use error_setg_file_open() for a better error message Date: Thu, 8 Jan 2026 08:06:19 +0100 Message-ID: <20260108070625.1586474-12-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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 (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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856504192158500 Content-Type: text/plain; charset="utf-8" The error message changes from Could not read blkdebug config file: REASON to Could not open 'FNAME': REASON I think the exact file name is more useful to know than the file's purpose. Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-10-armbru@redhat.com> --- block/blkdebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index c54aee0c84..8a4a8cb85e 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -288,7 +288,7 @@ static int read_config(BDRVBlkdebugState *s, const char= *filename, if (filename) { f =3D fopen(filename, "r"); if (f =3D=3D NULL) { - error_setg_errno(errp, errno, "Could not read blkdebug config = file"); + error_setg_file_open(errp, errno, filename); return -errno; } =20 --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856654; cv=none; d=zohomail.com; s=zohoarc; b=C497Q3QgXwsNFt0eudeBVpEb6ArMxEsELlIbTjQ2r5Z/R2QzQ/WFwMcv4tjz40G/T5XiERzTi4byl4Hu+7TBfXHoak85KTlyB7W+PPNvCvHg1TPkYXBKcsyTUrAoXHNCt9LxCCy6AQPd10ZqTGlJKb7n/ME9e/BWYeGUD7DQZYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856654; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kHXcfqUpdUadtzjstg1lmm3/GgEIWG1dn0oWD2mhTp0=; b=ewH4VZeU/ffU6FTCYUdjEVwHryeoI7aKrsfe7nSSrQfI15U6dPuyvHai6y88q6j6iiOmdEk09cThcgRdMzKfRLbKBrm1n8wylpwKjUp7iPem2xCeaWMbtn4x978Uls58qXWOw5Mvbw/RrWkillS+ETM7JTUbq8jSavATkMEtbi8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856654926446.9264220373723; Wed, 7 Jan 2026 23:17:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6V-0006ur-Aw; Thu, 08 Jan 2026 02:06:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6S-0006pM-OR for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6Q-0006cQ-Dl for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:40 -0500 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-675-4v7DRzduPa2bXC5MBjGXfA-1; Thu, 08 Jan 2026 02:06:33 -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 1D9C71800357; Thu, 8 Jan 2026 07:06:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7DF141800240; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 20B6321E61BB; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855997; 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=kHXcfqUpdUadtzjstg1lmm3/GgEIWG1dn0oWD2mhTp0=; b=LIfR2MDRAok5wog110Q9w2tR3ry/BvsbbyCtT6QRmYuznY5IH0KV3fW+3WPVt7q/W5xYH/ nXy/mx0DRz6QGWsebc97cAYzkQaNhkV74lO84UKkidIajwv7EEmg4QVewTSxLb79t0zD+c sIjImupBYW+6nzPhEIMAzrfTqeAE6+c= X-MC-Unique: 4v7DRzduPa2bXC5MBjGXfA-1 X-Mimecast-MFC-AGG-ID: 4v7DRzduPa2bXC5MBjGXfA_1767855992 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, "Dr. David Alan Gilbert" Subject: [PULL v2 12/17] error: Use error_setg_file_open() for simplicity and consistency Date: Thu, 8 Jan 2026 08:06:20 +0100 Message-ID: <20260108070625.1586474-13-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-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 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856657010158500 Content-Type: text/plain; charset="utf-8" Replace error_setg_errno(errp, errno, MSG, FNAME); by error_setg_file_open(errp, errno, FNAME); where MSG is "Could not open '%s'" or similar. Also replace equivalent uses of error_setg(). A few messages lose prefixes ("net dump: ", "SEV: ", __func__ ": "). We could put them back with error_prepend(). Not worth the bother. Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Message-ID: <20251121121438.1249498-11-armbru@redhat.com> [Conflict with commit 26b4a6ffe7f (monitor/hmp: Merge hmp-cmds-target.c within hmp-cmds.c) resolved] --- hw/9pfs/9p-local.c | 2 +- hw/acpi/core.c | 2 +- hw/core/loader.c | 2 +- hw/pci-host/xen_igd_pt.c | 2 +- monitor/hmp-cmds.c | 2 +- net/dump.c | 2 +- net/tap-bsd.c | 6 +++--- net/tap-linux.c | 2 +- target/i386/sev.c | 6 ++---- util/vfio-helpers.c | 5 ++--- 10 files changed, 14 insertions(+), 17 deletions(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 31e216227c..376b377698 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -1456,7 +1456,7 @@ static int local_init(FsContext *ctx, Error **errp) =20 data->mountfd =3D open(ctx->fs_root, O_DIRECTORY | O_RDONLY); if (data->mountfd =3D=3D -1) { - error_setg_errno(errp, errno, "failed to open '%s'", ctx->fs_root); + error_setg_file_open(errp, errno, ctx->fs_root); goto err; } =20 diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 2b74bed882..4e030d8e3b 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -277,7 +277,7 @@ void acpi_table_add(const QemuOpts *opts, Error **errp) int fd =3D open(*cur, O_RDONLY | O_BINARY); =20 if (fd < 0) { - error_setg(errp, "can't open file %s: %s", *cur, strerror(errn= o)); + error_setg_file_open(errp, errno, *cur); goto out; } =20 diff --git a/hw/core/loader.c b/hw/core/loader.c index 89d67d2760..16c11a4643 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -380,7 +380,7 @@ bool load_elf_hdr(const char *filename, void *hdr, bool= *is64, Error **errp) =20 fd =3D open(filename, O_RDONLY | O_BINARY); if (fd < 0) { - error_setg_errno(errp, errno, "Failed to open file: %s", filename); + error_setg_file_open(errp, errno, filename); return false; } if (read(fd, hdr, EI_NIDENT) !=3D EI_NIDENT) { diff --git a/hw/pci-host/xen_igd_pt.c b/hw/pci-host/xen_igd_pt.c index 5dd17ef236..f6016f2cd5 100644 --- a/hw/pci-host/xen_igd_pt.c +++ b/hw/pci-host/xen_igd_pt.c @@ -55,7 +55,7 @@ static void host_pci_config_read(int pos, int len, uint32= _t *val, Error **errp) =20 config_fd =3D open(path, O_RDWR); if (config_fd < 0) { - error_setg_errno(errp, errno, "Failed to open: %s", path); + error_setg_file_open(errp, errno, path); goto out; } =20 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index f7ff6ec90e..5a673cddb2 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -740,7 +740,7 @@ static uint64_t vtop(void *ptr, Error **errp) =20 fd =3D open("/proc/self/pagemap", O_RDONLY); if (fd =3D=3D -1) { - error_setg_errno(errp, errno, "Cannot open /proc/self/pagemap"); + error_setg_file_open(errp, errno, "/proc/self/pagemap"); return -1; } =20 diff --git a/net/dump.c b/net/dump.c index 581234b775..0c39f09892 100644 --- a/net/dump.c +++ b/net/dump.c @@ -111,7 +111,7 @@ static int net_dump_state_init(DumpState *s, const char= *filename, =20 fd =3D open(filename, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0644); if (fd < 0) { - error_setg_errno(errp, errno, "net dump: can't open %s", filename); + error_setg_file_open(errp, errno, filename); return -1; } =20 diff --git a/net/tap-bsd.c b/net/tap-bsd.c index bbf84d1828..3fd300d46f 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -68,7 +68,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, } } if (fd < 0) { - error_setg_errno(errp, errno, "could not open %s", dname); + error_setg_file_open(errp, errno, dname); return -1; } =20 @@ -118,7 +118,7 @@ static int tap_open_clone(char *ifname, int ifname_size= , Error **errp) =20 fd =3D RETRY_ON_EINTR(open(PATH_NET_TAP, O_RDWR)); if (fd < 0) { - error_setg_errno(errp, errno, "could not open %s", PATH_NET_TAP); + error_setg_file_open(errp, errno, PATH_NET_TAP); return -1; } =20 @@ -166,7 +166,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_h= dr, snprintf(dname, sizeof dname, "/dev/%s", ifname); fd =3D RETRY_ON_EINTR(open(dname, O_RDWR)); if (fd < 0 && errno !=3D ENOENT) { - error_setg_errno(errp, errno, "could not open %s", dname); + error_setg_file_open(errp, errno, dname); return -1; } } diff --git a/net/tap-linux.c b/net/tap-linux.c index 2a90b58467..909c4f1fcf 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -57,7 +57,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, if (fd < 0) { fd =3D RETRY_ON_EINTR(open(PATH_NET_TUN, O_RDWR)); if (fd < 0) { - error_setg_errno(errp, errno, "could not open %s", PATH_NET_TU= N); + error_setg_file_open(errp, errno, PATH_NET_TUN); return -1; } } diff --git a/target/i386/sev.c b/target/i386/sev.c index fb5a3b5d77..1d70f96ec1 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -892,8 +892,7 @@ static SevCapability *sev_get_capabilities(Error **errp) =20 fd =3D open(sev_device, O_RDWR); if (fd < 0) { - error_setg_errno(errp, errno, "SEV: Failed to open %s", - sev_device); + error_setg_file_open(errp, errno, sev_device); g_free(sev_device); return NULL; } @@ -1820,8 +1819,7 @@ static int sev_common_kvm_init(ConfidentialGuestSuppo= rt *cgs, Error **errp) devname =3D object_property_get_str(OBJECT(sev_common), "sev-device", = NULL); sev_common->sev_fd =3D open(devname, O_RDWR); if (sev_common->sev_fd < 0) { - error_setg(errp, "%s: Failed to open %s '%s'", __func__, - devname, strerror(errno)); + error_setg_file_open(errp, errno, devname); g_free(devname); return -1; } diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 44b457c442..c619516163 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -309,7 +309,7 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const c= har *device, s->container =3D open("/dev/vfio/vfio", O_RDWR); =20 if (s->container =3D=3D -1) { - error_setg_errno(errp, errno, "Failed to open /dev/vfio/vfio"); + error_setg_file_open(errp, errno, "/dev/vfio/vfio"); return -errno; } if (ioctl(s->container, VFIO_GET_API_VERSION) !=3D VFIO_API_VERSION) { @@ -333,8 +333,7 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const c= har *device, =20 s->group =3D open(group_file, O_RDWR); if (s->group =3D=3D -1) { - error_setg_errno(errp, errno, "Failed to open VFIO group file: %s", - group_file); + error_setg_file_open(errp, errno, group_file); g_free(group_file); ret =3D -errno; goto fail_container; --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856521; cv=none; d=zohomail.com; s=zohoarc; b=OIkdycpXOoCj9QU72UdjjT3UNvLkkyZYZLow9B9psbxvgN9MmnnZBryBoOUubQZX8PYavLdr4SWRyMTHZgg0uQ+wU52XTasIALQOHjbAM/nbEJDXZ6oz0BmaHIFOzJ06JC2EddrJrHhhmPvCSwnVfPODxqonKSBtAIgrxBWwg2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856521; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZPKCPUUR4fzGWdFpXlfe46sZ0bt7B0rWoFCl24emMc4=; b=VcP6E5cB56IS9rpxX6CnarE6WVoriULlqiMJQVMFYQrowKBgYHlcB6CV41xOg+5GWQcSRLA3yt82EvheLYLDHElFFGF2GvYxkuhr1Jsx4Mu/fnz093ou/nm8WoyTG1PfNlvfr3sW7/EGpI/zx/D0095dOi02uBbo8Hg61Xsk6H0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856516005437.7683733134554; Wed, 7 Jan 2026 23:15:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6b-0007I5-Ak; Thu, 08 Jan 2026 02:06:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6R-0006lp-4a for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6O-0006bY-5x for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:38 -0500 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-264-9MeZ70a8MCqY2t9H_GoaRg-1; Thu, 08 Jan 2026 02:06:33 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 C39871800342; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 787C419560B4; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 24BB421E61BD; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZPKCPUUR4fzGWdFpXlfe46sZ0bt7B0rWoFCl24emMc4=; b=hhZSVgxpu7W5W4dz+lVxlsTp89I2pImavfjFjHYipUAdcn/bIEe4XFH9p/P+I/YuZJT9rk eL7rgDS4V0F8iVB8JV2lCaNBbQ9oG0aqqp3HBnRdKwxVc1OUero1MajUOZEQ+W/3VJqS0e 11FIIlAQCfaQBNdtY8GgplmOQG1Sst4= X-MC-Unique: 9MeZ70a8MCqY2t9H_GoaRg-1 X-Mimecast-MFC-AGG-ID: 9MeZ70a8MCqY2t9H_GoaRg_1767855991 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 13/17] net/slirp: Improve file open error message Date: Thu, 8 Jan 2026 08:06:21 +0100 Message-ID: <20260108070625.1586474-14-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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 (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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856522368158500 This error reports failure to create a temporary file, and error_setg_file_open() would probably be too terse, so merely switch to error_setg_errno() to add errno information. Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-12-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/slirp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/slirp.c b/net/slirp.c index 120eef6122..5996fec512 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -1034,8 +1034,10 @@ static int slirp_smb(SlirpState* s, const char *expo= rted_dir, =20 f =3D fopen(smb_conf, "w"); if (!f) { + int eno =3D errno; + slirp_smb_cleanup(s); - error_setg(errp, + error_setg_errno(errp, eno, "Could not create samba server configuration file '%s'", smb_conf); g_free(smb_conf); --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856521; cv=none; d=zohomail.com; s=zohoarc; b=D1CK1afDrDhB1qGCApTT5WOncBbJ0WPHEIfQxnCKQjgE9Sa+8Rqj8SVfnbk4RwnM9Y59Zzi1JRPpF7M6yIKC7I8CCb9klDVpG1ri3waxWiPE8CZFIC8yDZErMcO8XDlV/TEnFQuY/tI/ZWxvjrglNUmF7PJWZPBu6O+ZfO5nN94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856521; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TkjBCERXAdlruTrVCInbFwKENfOuOCCwFfwxiCh0zrY=; b=AwWfgpT8HkuSF9yLvwkGZwpL9Cfazsh5MvpIzK9ToCEvJoIqKoBVY0WXZ+Xcmkxq370ZA8LSbOyV6vdYqGbz0+WcQ0kNvLm6sXow4vAfzdCCGcijbyO1OCgmv1supApCoF7iUbHZrCjS1VRNbHPbZNJHG9VJ3L6Sy3x7HJMh2og= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856521285707.8385322312207; Wed, 7 Jan 2026 23:15:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6W-00070s-Mp; Thu, 08 Jan 2026 02:06:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6S-0006pO-UF for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6Q-0006c2-P6 for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:40 -0500 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-246-Kq_k7ZS-M2SWvVuxLD0rWw-1; Thu, 08 Jan 2026 02:06:33 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2ED0F1956088; Thu, 8 Jan 2026 07:06:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 88CA618007D2; Thu, 8 Jan 2026 07:06:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 28D9C21E61BF; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TkjBCERXAdlruTrVCInbFwKENfOuOCCwFfwxiCh0zrY=; b=hWltHUnz7y3jkCyzk4qWJod9WgeqTnsHg9WLd1LpBgkShgKxz0WrJ6pWoWjh1k/MWDy44G EVDodRgGAdj7xRL+jkiB9HRZu6HWmv04Lmtm80vcxMN4glbB5VH1fl50jxwOA8pxhLY52D Rp+3LqJxrqU1SVwtoYYltMdJwJmvzgU= X-MC-Unique: Kq_k7ZS-M2SWvVuxLD0rWw-1 X-Mimecast-MFC-AGG-ID: Kq_k7ZS-M2SWvVuxLD0rWw_1767855992 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 14/17] error: Use error_setg_errno() to improve error messages Date: Thu, 8 Jan 2026 08:06:22 +0100 Message-ID: <20260108070625.1586474-15-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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 (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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856522318158500 A few error messages show numeric errno codes. Use error_setg_errno() to show human-readable text instead. Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-13-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [Trivial fixup to riscv_kvm_cpu_finalize_features()] --- backends/cryptodev-lkcf.c | 2 +- hw/ppc/spapr.c | 6 +++--- hw/vfio/migration-multifd.c | 5 +++-- migration/rdma.c | 3 +-- net/l2tpv3.c | 6 ++---- target/riscv/kvm/kvm-cpu.c | 10 +++++----- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/backends/cryptodev-lkcf.c b/backends/cryptodev-lkcf.c index 97a8a8812c..40c7bd3c5a 100644 --- a/backends/cryptodev-lkcf.c +++ b/backends/cryptodev-lkcf.c @@ -218,7 +218,7 @@ static void cryptodev_lkcf_init(CryptoDevBackend *backe= nd, Error **errp) } lkcf->eventfd =3D eventfd(0, 0); if (lkcf->eventfd < 0) { - error_setg(errp, "Failed to create eventfd: %d", errno); + error_setg_errno(errp, errno, "Failed to create eventfd"); return; } =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b3c5097bf8..f129e4ec39 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2700,9 +2700,9 @@ static void spapr_set_vsmt_mode(SpaprMachineState *sp= apr, Error **errp) ret =3D kvmppc_set_smt_threads(spapr->vsmt); if (ret) { /* Looks like KVM isn't able to change VSMT mode */ - error_setg(&local_err, - "Failed to set KVM's VSMT mode to %d (errno %d)", - spapr->vsmt, ret); + error_setg_errno(&local_err, -ret, + "Failed to set KVM's VSMT mode to %d", + spapr->vsmt); /* We can live with that if the default one is big enough * for the number of threads, and a submultiple of the one * we want. In this case we'll waste some vcpu ids, but diff --git a/hw/vfio/migration-multifd.c b/hw/vfio/migration-multifd.c index e4785031a7..4a855f4e12 100644 --- a/hw/vfio/migration-multifd.c +++ b/hw/vfio/migration-multifd.c @@ -725,8 +725,9 @@ vfio_multifd_save_complete_precopy_thread(SaveCompleteP= recopyThreadData *d, data_size =3D read(migration->data_fd, &packet->data, migration->data_buffer_size); if (data_size < 0) { - error_setg(errp, "%s: reading state buffer %" PRIu32 " failed:= %d", - vbasedev->name, idx, errno); + error_setg_errno(errp, errno, + "%s: reading state buffer %" PRIu32 " failed", + vbasedev->name, idx); goto thread_exit; } else if (data_size =3D=3D 0) { break; diff --git a/migration/rdma.c b/migration/rdma.c index 337b415889..9e301cf917 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2349,8 +2349,7 @@ static int qemu_get_cm_event_timeout(RDMAContext *rdm= a, error_setg(errp, "RDMA ERROR: poll cm event timeout"); return -1; } else if (ret < 0) { - error_setg(errp, "RDMA ERROR: failed to poll cm event, errno=3D%i", - errno); + error_setg_errno(errp, errno, "RDMA ERROR: failed to poll cm event= "); return -1; } else if (poll_fd.revents & POLLIN) { if (rdma_get_cm_event(rdma->channel, cm_event) < 0) { diff --git a/net/l2tpv3.c b/net/l2tpv3.c index cdfc641aa6..3044fa4608 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -639,13 +639,11 @@ int net_init_l2tpv3(const Netdev *netdev, } fd =3D socket(result->ai_family, result->ai_socktype, result->ai_proto= col); if (fd =3D=3D -1) { - fd =3D -errno; - error_setg(errp, "socket creation failed, errno =3D %d", - -fd); + error_setg_errno(errp, errno, "socket creation failed"); goto outerr; } if (bind(fd, (struct sockaddr *) result->ai_addr, result->ai_addrlen))= { - error_setg(errp, "could not bind socket err=3D%i", errno); + error_setg_errno(errp, errno, "could not bind socket"); goto outerr; } if (!qemu_set_blocking(fd, false, errp)) { diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 5d792563b9..b047ffa9c0 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1996,8 +1996,8 @@ static bool kvm_cpu_realize(CPUState *cs, Error **err= p) if (riscv_has_ext(&cpu->env, RVV)) { ret =3D prctl(PR_RISCV_V_SET_CONTROL, PR_RISCV_V_VSTATE_CTRL_ON); if (ret) { - error_setg(errp, "Error in prctl PR_RISCV_V_SET_CONTROL, code:= %s", - strerrorname_np(errno)); + error_setg_errno(errp, errno, + "Error in prctl PR_RISCV_V_SET_CONTROL"); return false; } } @@ -2032,7 +2032,7 @@ void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, E= rror **errp) reg.addr =3D (uint64_t)&val; ret =3D ioctl(kvmcpu.cpufd, KVM_GET_ONE_REG, ®); if (ret !=3D 0) { - error_setg(errp, "Unable to read cbom_blocksize, error %d", er= rno); + error_setg_errno(errp, errno, "Unable to read cbom_blocksize"); return; } =20 @@ -2051,7 +2051,7 @@ void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, E= rror **errp) reg.addr =3D (uint64_t)&val; ret =3D ioctl(kvmcpu.cpufd, KVM_GET_ONE_REG, ®); if (ret !=3D 0) { - error_setg(errp, "Unable to read cboz_blocksize, error %d", er= rno); + error_setg_errno(errp, errno, "Unable to read cboz_blocksize"); return; } =20 @@ -2073,7 +2073,7 @@ void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, E= rror **errp) reg.addr =3D (uint64_t)&val; ret =3D ioctl(kvmcpu.cpufd, KVM_GET_ONE_REG, ®); if (ret !=3D 0) { - error_setg(errp, "Unable to read vlenb register, error %d", er= rno); + error_setg_errno(errp, errno, "Unable to read vlenb register"); return; } =20 --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856138; cv=none; d=zohomail.com; s=zohoarc; b=CWACt0zEplZzYtG6ez7ReI7yjob+9dC0mRmeozsYEctXyyHsa7XyD8lw64vwZ13KdAOpy0UBrEWhfFq8L1b3BBSIJbQAzSm/IHMAhbPrtGUvb+qsQXvHbWKDcr/7Z4KpRc1CMnn5e+7F9eAU70wwjpIPyejNV0ogdnrbNTTUokM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856138; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lfrf2Vh7y/59XVqNRaeDs87uvCGai5ZnCtsqsvw3gto=; b=CMjZ3Jie1PbACET4vXlb3b0GZbdC7THPkWNRlAQPbxTtkRTfXjxakB663gijJgBSM4y48zgg4An3ytcfcj0/rIK/ANXK2B6MCbc7TXagzLUq0RYGcB74oDusp2+qMAmGLRUe0JgAhCxAUnkK8z/XZFa/K0x6noUTYw9b4ANHGkk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856138543107.12292160130016; Wed, 7 Jan 2026 23:08:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6c-0007JZ-4O; Thu, 08 Jan 2026 02:06:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6W-0006zm-FR for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6T-0006dv-W3 for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:44 -0500 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-499-BOSbgIEMMrqOMoirazsimA-1; Thu, 08 Jan 2026 02:06:35 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6CCA31956088; Thu, 8 Jan 2026 07:06:34 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DA60118001D5; Thu, 8 Jan 2026 07:06:33 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2D2C921E6143; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767856001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lfrf2Vh7y/59XVqNRaeDs87uvCGai5ZnCtsqsvw3gto=; b=KWgsUSZfRxHqnxIWJi7Ib5VMyyApDwo0XXgItWctTQ9KUQfQgjN8MdvbyPZ0WNXqVh03Sw MRBzqn9AzRTnnLClsOOKPyfzU1mvScY61ey8qrx2umZPkOl8OH6YkyGfBKSmqiss5glGYv V/my1Rinmkw2yIUYItvFl6kgqcRFBQk= X-MC-Unique: BOSbgIEMMrqOMoirazsimA-1 X-Mimecast-MFC-AGG-ID: BOSbgIEMMrqOMoirazsimA_1767855994 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Jagannathan Raman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 15/17] error: Use error_setg_errno() for simplicity and consistency Date: Thu, 8 Jan 2026 08:06:23 +0100 Message-ID: <20260108070625.1586474-16-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856140940158500 Use error_setg_errno() instead of passing the value of strerror() or g_strerror() to error_setg(). The separator between the error message proper and the value of strerror() changes from " : ", "", " - ", "- " to ": " in places. Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-14-armbru@redhat.com> Acked-by: Jagannathan Raman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- backends/spdm-socket.c | 4 ++-- backends/tpm/tpm_emulator.c | 13 +++++-------- hw/9pfs/9p.c | 3 +-- hw/acpi/core.c | 3 +-- hw/intc/openpic_kvm.c | 3 +-- hw/intc/xics_kvm.c | 5 +++-- hw/remote/vfio-user-obj.c | 18 +++++++++--------- hw/sensor/emc141x.c | 4 ++-- hw/sensor/tmp421.c | 4 ++-- hw/smbios/smbios.c | 4 ++-- hw/virtio/vdpa-dev.c | 4 ++-- migration/postcopy-ram.c | 10 +++++----- net/slirp.c | 5 +++-- qga/commands-posix-ssh.c | 23 +++++++++++++---------- system/vl.c | 2 +- target/ppc/kvm.c | 5 ++--- 16 files changed, 54 insertions(+), 56 deletions(-) diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index bc5c7afb3c..b625a65d28 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -167,7 +167,7 @@ int spdm_socket_connect(uint16_t port, Error **errp) =20 client_socket =3D socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (client_socket < 0) { - error_setg(errp, "cannot create socket: %s", strerror(errno)); + error_setg_errno(errp, errno, "cannot create socket"); return -1; } =20 @@ -179,7 +179,7 @@ int spdm_socket_connect(uint16_t port, Error **errp) =20 if (connect(client_socket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { - error_setg(errp, "cannot connect: %s", strerror(errno)); + error_setg_errno(errp, errno, "cannot connect"); close(client_socket); return -1; } diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index f10b9074fb..f52cb4d435 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -225,8 +225,7 @@ static int tpm_emulator_set_locality(TPMEmulator *tpm_e= mu, uint8_t locty_number, if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_LOCALITY, &loc, sizeof(loc), sizeof(loc.u.resp.tpm_result), sizeof(loc)) < 0) { - error_setg(errp, "tpm-emulator: could not set locality : %s", - strerror(errno)); + error_setg_errno(errp, errno, "tpm-emulator: could not set localit= y"); return -1; } =20 @@ -315,8 +314,7 @@ static int tpm_emulator_stop_tpm(TPMBackend *tb, Error = **errp) =20 if (tpm_emulator_ctrlcmd(tpm_emu, CMD_STOP, &res, 0, sizeof(ptm_res), sizeof(res)) < 0) { - error_setg(errp, "tpm-emulator: Could not stop TPM: %s", - strerror(errno)); + error_setg_errno(errp, errno, "tpm-emulator: Could not stop TPM"); return -1; } =20 @@ -377,8 +375,8 @@ static int tpm_emulator_set_buffer_size(TPMBackend *tb, if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_BUFFERSIZE, &psbs, sizeof(psbs.u.req), sizeof(psbs.u.resp.tpm_re= sult), sizeof(psbs.u.resp)) < 0) { - error_setg(errp, "tpm-emulator: Could not set buffer size: %s", - strerror(errno)); + error_setg_errno(errp, errno, + "tpm-emulator: Could not set buffer size"); return -1; } =20 @@ -426,8 +424,7 @@ static int tpm_emulator_startup_tpm_resume(TPMBackend *= tb, size_t buffersize, if (tpm_emulator_ctrlcmd(tpm_emu, CMD_INIT, &init, sizeof(init), sizeof(init.u.resp.tpm_result), sizeof(init)) < 0) { - error_setg(errp, "tpm-emulator: could not send INIT: %s", - strerror(errno)); + error_setg_errno(errp, errno, "tpm-emulator: could not send INIT"); goto err_exit; } =20 diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index bc4a016ee3..6fbe604ce8 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -4345,8 +4345,7 @@ int v9fs_device_realize_common(V9fsState *s, const V9= fsTransport *t, * use co-routines here. */ if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) { - error_setg(errp, - "error in converting name to path %s", strerror(errno)); + error_setg_errno(errp, errno, "error in converting name to path"); goto out; } if (s->ops->lstat(&s->ctx, &path, &stat)) { diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 4e030d8e3b..d9979b0da9 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -293,8 +293,7 @@ void acpi_table_add(const QemuOpts *opts, Error **errp) memcpy(blob + bloblen, data, r); bloblen +=3D r; } else if (errno !=3D EINTR) { - error_setg(errp, "can't read file %s: %s", *cur, - strerror(errno)); + error_setg_errno(errp, errno, "can't read file %s", *cur); close(fd); goto out; } diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 9aafef5d9e..fbf0bdbe07 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -223,8 +223,7 @@ static void kvm_openpic_realize(DeviceState *dev, Error= **errp) cd.type =3D kvm_openpic_model; ret =3D kvm_vm_ioctl(s, KVM_CREATE_DEVICE, &cd); if (ret < 0) { - error_setg(errp, "Can't create device %d: %s", - cd.type, strerror(errno)); + error_setg_errno(errp, errno, "Can't create device %d", cd.type); return; } opp->fd =3D cd.fd; diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index ee72969f5f..61f66d1019 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -165,8 +165,9 @@ void icp_kvm_realize(DeviceState *dev, Error **errp) if (ret < 0) { Error *local_err =3D NULL; =20 - error_setg(&local_err, "Unable to connect CPU%ld to kernel XICS: %= s", - vcpu_id, strerror(errno)); + error_setg_errno(&local_err, errno, + "Unable to connect CPU%ld to kernel XICS", + vcpu_id); if (errno =3D=3D ENOSPC) { error_append_hint(&local_err, "Try -smp maxcpus=3DN with N < %= u\n", MACHINE(qdev_get_machine())->smp.max_cpus); diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c index 4eb036a546..12ecdab6de 100644 --- a/hw/remote/vfio-user-obj.c +++ b/hw/remote/vfio-user-obj.c @@ -751,7 +751,7 @@ static void vfu_object_init_ctx(VfuObject *o, Error **e= rrp) LIBVFIO_USER_FLAG_ATTACH_NB, o, VFU_DEV_TYPE_PCI); if (o->vfu_ctx =3D=3D NULL) { - error_setg(errp, "vfu: Failed to create context - %s", strerror(er= rno)); + error_setg_errno(errp, errno, "vfu: Failed to create context"); return; } =20 @@ -776,9 +776,9 @@ static void vfu_object_init_ctx(VfuObject *o, Error **e= rrp) =20 ret =3D vfu_pci_init(o->vfu_ctx, pci_type, PCI_HEADER_TYPE_NORMAL, 0); if (ret < 0) { - error_setg(errp, - "vfu: Failed to attach PCI device %s to context - %s", - o->device, strerror(errno)); + error_setg_errno(errp, errno, + "vfu: Failed to attach PCI device %s to context", + o->device); goto fail; } =20 @@ -792,9 +792,9 @@ static void vfu_object_init_ctx(VfuObject *o, Error **e= rrp) VFU_REGION_FLAG_RW | VFU_REGION_FLAG_ALWAYS_CB, NULL, 0, -1, 0); if (ret < 0) { - error_setg(errp, - "vfu: Failed to setup config space handlers for %s- %s", - o->device, strerror(errno)); + error_setg_errno(errp, errno, + "vfu: Failed to setup config space handlers for %= s", + o->device); goto fail; } =20 @@ -822,8 +822,8 @@ static void vfu_object_init_ctx(VfuObject *o, Error **e= rrp) =20 ret =3D vfu_realize_ctx(o->vfu_ctx); if (ret < 0) { - error_setg(errp, "vfu: Failed to realize device %s- %s", - o->device, strerror(errno)); + error_setg_errno(errp, errno, "vfu: Failed to realize device %s", + o->device); goto fail; } =20 diff --git a/hw/sensor/emc141x.c b/hw/sensor/emc141x.c index 7b2ce383a1..a51fc44395 100644 --- a/hw/sensor/emc141x.c +++ b/hw/sensor/emc141x.c @@ -59,7 +59,7 @@ static void emc141x_get_temperature(Object *obj, Visitor = *v, const char *name, unsigned tempid; =20 if (sscanf(name, "temperature%u", &tempid) !=3D 1) { - error_setg(errp, "error reading %s: %s", name, g_strerror(errno)); + error_setg_errno(errp, errno, "error reading %s", name); return; } =20 @@ -86,7 +86,7 @@ static void emc141x_set_temperature(Object *obj, Visitor = *v, const char *name, } =20 if (sscanf(name, "temperature%u", &tempid) !=3D 1) { - error_setg(errp, "error reading %s: %s", name, g_strerror(errno)); + error_setg_errno(errp, errno, "error reading %s", name); return; } =20 diff --git a/hw/sensor/tmp421.c b/hw/sensor/tmp421.c index 3421c44086..127edd0ba5 100644 --- a/hw/sensor/tmp421.c +++ b/hw/sensor/tmp421.c @@ -117,7 +117,7 @@ static void tmp421_get_temperature(Object *obj, Visitor= *v, const char *name, int tempid; =20 if (sscanf(name, "temperature%d", &tempid) !=3D 1) { - error_setg(errp, "error reading %s: %s", name, g_strerror(errno)); + error_setg_errno(errp, errno, "error reading %s", name); return; } =20 @@ -154,7 +154,7 @@ static void tmp421_set_temperature(Object *obj, Visitor= *v, const char *name, } =20 if (sscanf(name, "temperature%d", &tempid) !=3D 1) { - error_setg(errp, "error reading %s: %s", name, g_strerror(errno)); + error_setg_errno(errp, errno, "error reading %s", name); return; } =20 diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index be97a5effc..7d7141851b 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -1281,8 +1281,8 @@ static int save_opt_one(void *opaque, break; } if (ret < 0) { - error_setg(errp, "Unable to read from %s: %s", - value, strerror(errno)); + error_setg_errno(errp, errno, "Unable to read from %s", + value); qemu_close(fd); return -1; } diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c index f2377d2d50..4532d63653 100644 --- a/hw/virtio/vdpa-dev.c +++ b/hw/virtio/vdpa-dev.c @@ -41,8 +41,8 @@ vhost_vdpa_device_get_u32(int fd, unsigned long int cmd, = Error **errp) uint32_t val =3D (uint32_t)-1; =20 if (ioctl(fd, cmd, &val) < 0) { - error_setg(errp, "vhost-vdpa-device: cmd 0x%lx failed: %s", - cmd, strerror(errno)); + error_setg_errno(errp, errno, "vhost-vdpa-device: cmd 0x%lx failed= ", + cmd); } =20 return val; diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 98a98138be..ac410676ef 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -582,7 +582,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingSt= ate *mis, Error **errp) =20 ufd =3D uffd_open(O_CLOEXEC); if (ufd =3D=3D -1) { - error_setg(errp, "Userfaultfd not available: %s", strerror(errno)); + error_setg_errno(errp, errno, "Userfaultfd not available"); goto out; } =20 @@ -620,7 +620,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingSt= ate *mis, Error **errp) * it was enabled. */ if (munlockall()) { - error_setg(errp, "munlockall() failed: %s", strerror(errno)); + error_setg_errno(errp, errno, "munlockall() failed"); goto out; } =20 @@ -632,7 +632,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingSt= ate *mis, Error **errp) testarea =3D mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (testarea =3D=3D MAP_FAILED) { - error_setg(errp, "Failed to map test area: %s", strerror(errno)); + error_setg_errno(errp, errno, "Failed to map test area"); goto out; } g_assert(QEMU_PTR_IS_ALIGNED(testarea, pagesize)); @@ -642,14 +642,14 @@ bool postcopy_ram_supported_by_host(MigrationIncoming= State *mis, Error **errp) reg_struct.mode =3D UFFDIO_REGISTER_MODE_MISSING; =20 if (ioctl(ufd, UFFDIO_REGISTER, ®_struct)) { - error_setg(errp, "UFFDIO_REGISTER failed: %s", strerror(errno)); + error_setg_errno(errp, errno, "UFFDIO_REGISTER failed"); goto out; } =20 range_struct.start =3D (uintptr_t)testarea; range_struct.len =3D pagesize; if (ioctl(ufd, UFFDIO_UNREGISTER, &range_struct)) { - error_setg(errp, "UFFDIO_UNREGISTER failed: %s", strerror(errno)); + error_setg_errno(errp, errno, "UFFDIO_UNREGISTER failed"); goto out; } =20 diff --git a/net/slirp.c b/net/slirp.c index 5996fec512..04925f3318 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -1020,8 +1020,9 @@ static int slirp_smb(SlirpState* s, const char *expor= ted_dir, } =20 if (access(exported_dir, R_OK | X_OK)) { - error_setg(errp, "Error accessing shared directory '%s': %s", - exported_dir, strerror(errno)); + error_setg_errno(errp, errno, + "Error accessing shared directory '%s'", + exported_dir); return -1; } =20 diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c index 246171d323..661972e34e 100644 --- a/qga/commands-posix-ssh.c +++ b/qga/commands-posix-ssh.c @@ -61,20 +61,22 @@ mkdir_for_user(const char *path, const struct passwd *p, mode_t mode, Error **errp) { if (g_mkdir(path, mode) =3D=3D -1) { - error_setg(errp, "failed to create directory '%s': %s", - path, g_strerror(errno)); + error_setg_errno(errp, errno, "failed to create directory '%s'", + path); return false; } =20 if (chown(path, p->pw_uid, p->pw_gid) =3D=3D -1) { - error_setg(errp, "failed to set ownership of directory '%s': %s", - path, g_strerror(errno)); + error_setg_errno(errp, errno, + "failed to set ownership of directory '%s'", + path); return false; } =20 if (chmod(path, mode) =3D=3D -1) { - error_setg(errp, "failed to set permissions of directory '%s': %s", - path, g_strerror(errno)); + error_setg_errno(errp, errno, + "failed to set permissions of directory '%s'", + path); return false; } =20 @@ -95,14 +97,15 @@ write_authkeys(const char *path, const GStrv keys, } =20 if (chown(path, p->pw_uid, p->pw_gid) =3D=3D -1) { - error_setg(errp, "failed to set ownership of directory '%s': %s", - path, g_strerror(errno)); + error_setg_errno(errp, errno, + "failed to set ownership of directory '%s'", + path); return false; } =20 if (chmod(path, 0600) =3D=3D -1) { - error_setg(errp, "failed to set permissions of '%s': %s", - path, g_strerror(errno)); + error_setg_errno(errp, errno, "failed to set permissions of '%s'", + path); return false; } =20 diff --git a/system/vl.c b/system/vl.c index b60b883050..aa9a155041 100644 --- a/system/vl.c +++ b/system/vl.c @@ -618,7 +618,7 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, E= rror **errp) } #endif if (dupfd =3D=3D -1) { - error_setg(errp, "error duplicating fd: %s", strerror(errno)); + error_setg_errno(errp, errno, "error duplicating fd"); return -1; } =20 diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 3b2f1077da..1521787b3f 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2699,9 +2699,8 @@ int kvmppc_get_htab_fd(bool write, uint64_t index, Er= ror **errp) =20 ret =3D kvm_vm_ioctl(kvm_state, KVM_PPC_GET_HTAB_FD, &s); if (ret < 0) { - error_setg(errp, "Unable to open fd for %s HPT %s KVM: %s", - write ? "writing" : "reading", write ? "to" : "from", - strerror(errno)); + error_setg_errno(errp, errno, "Unable to open fd for %s HPT %s KVM= ", + write ? "writing" : "reading", write ? "to" : "from"); return -errno; } =20 --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856530; cv=none; d=zohomail.com; s=zohoarc; b=SoqDxQS/NWDm5EiFWZ0n5CkxV2wrHPKWeehe21zl4A5eNj9TKsuj5c6kiluKyc5GDbOQwf/VEfQYEPO3QsUphhEuHypECD9vAsfrHkkBZwGHnputC8Pek3/pFy+uBOrEiezgguRml8CdNsI08folDfyHGitT/+LN7YcP6u5htRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856530; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LQtRUV903LPCNVI5wTzSTshNcU6NvgG8VOOQh3qtDJM=; b=P2VPv8jqGi2czuLKN8TIa+AwCNi9KuMKdwgR65RcPz0NyP9m72JR10yj1I7PSajc3P4jDUA9TlZ+Iwmg07yDkAXk/mjn5MeH9M+Dn43Fjczygn8RAR1TLiXhLO5rK87z4z9/lTf2Oe+217DcYbVcOzHvt7B4WZ6dt2EekItvTBc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856530691251.4059018518725; Wed, 7 Jan 2026 23:15:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6X-00073G-33; Thu, 08 Jan 2026 02:06:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6S-0006pN-PZ for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6R-0006cu-AJ for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:40 -0500 Received: from mx-prod-mc-01.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-689-2KDUCSFYM-C2Nr5eM-UDtQ-1; Thu, 08 Jan 2026 02:06:34 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0617B1955F34; Thu, 8 Jan 2026 07:06:34 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B8758180009E; Thu, 8 Jan 2026 07:06:33 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3129021E6147; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LQtRUV903LPCNVI5wTzSTshNcU6NvgG8VOOQh3qtDJM=; b=PeKmaCAnNZRhrtEfC3CUGIpnhmEW35msKScnbCT5WKokw43s/Z3LV/1TN22DKXEVjLzivo ELjb+/Ju8holYCI08BtuZmZ+5TNHIQNyWuUs+aDL1Qgu4vRIZaGAhoGzLimXfQKPopnh2u vfKMlCKxN7eOy82qksv8inj+rSlL2QM= X-MC-Unique: 2KDUCSFYM-C2Nr5eM-UDtQ-1 X-Mimecast-MFC-AGG-ID: 2KDUCSFYM-C2Nr5eM-UDtQ_1767855994 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Kostiantyn Kostiuk , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 16/17] qga/commands-win32: Use error_setg_win32() for better error messages Date: Thu, 8 Jan 2026 08:06:24 +0100 Message-ID: <20260108070625.1586474-17-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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 (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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856532368158500 We include numeric GetLastError() codes in error messages in a few places, like this: error_setg(errp, "GRIPE: %d", (int)GetLastError()); Show text instead, like this: error_setg_win32(errp, GetLastError(), "GRIPE"); Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-15-armbru@redhat.com> Reviewed-by: Kostiantyn Kostiuk Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qga/commands-win32.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index acc2c11589..0fd0c966e4 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1798,8 +1798,8 @@ void qmp_guest_set_time(bool has_time, int64_t time_n= s, Error **errp) tf.dwHighDateTime =3D (DWORD) (time >> 32); =20 if (!FileTimeToSystemTime(&tf, &ts)) { - error_setg(errp, "Failed to convert system time %d", - (int)GetLastError()); + error_setg_win32(errp, GetLastError(), + "Failed to convert system time"); return; } =20 @@ -1810,7 +1810,8 @@ void qmp_guest_set_time(bool has_time, int64_t time_n= s, Error **errp) } =20 if (!SetSystemTime(&ts)) { - error_setg(errp, "Failed to set time to guest: %d", (int)GetLastEr= ror()); + error_setg_win32(errp, GetLastError(), + "Failed to set time to guest"); return; } } @@ -1834,13 +1835,12 @@ GuestLogicalProcessorList *qmp_guest_get_vcpus(Erro= r **errp) (length > sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION))) { ptr =3D pslpi =3D g_malloc0(length); if (GetLogicalProcessorInformation(pslpi, &length) =3D=3D FALSE) { - error_setg(&local_err, "Failed to get processor information: %= d", - (int)GetLastError()); + error_setg_win32(&local_err, GetLastError(), + "Failed to get processor information"); } } else { - error_setg(&local_err, - "Failed to get processor information buffer length: %d", - (int)GetLastError()); + error_setg_win32(&local_err, GetLastError(), + "Failed to get processor information buffer lengt= h"); } =20 while ((local_err =3D=3D NULL) && (length > 0)) { --=20 2.52.0 From nobody Sun Feb 8 22:21:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767856651; cv=none; d=zohomail.com; s=zohoarc; b=DF1pAVcQZQZMtQ/Zt2aSMZp3x94Y4Of6uNOYTEsx9/nbhPFqb3zr141i6trGqdCj1V2B4cNMjskM260TCFc8rkrPgl102knfyJ0A74Bf4ezErrM/iBL3UDQ82VEEGT1iX3TUMvqLluFk81idcBBKXKeal/rAL6ZOsGfTPgDzH4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767856651; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jBdzRkZameKTVyrA0KTWn3oMxDovyCVEyuheC2ocBx0=; b=cb49HFtZ5RjxKWQR1A8HcDvv/R3Te9gyAL289cByt5jwSKuALzJVt5/uuJBdl7wpmcFB6bPdKTlnv/NgKGTCD9n4At9mLzUHT8TLCZbREWYOoir5JM/4QlS3zayYgntxVwPkDufPQRJT+C7SiiodR131UdraxCvAF03fQL4hFo4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767856651645334.6672942433786; Wed, 7 Jan 2026 23:17:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdk6V-0006xL-TL; Thu, 08 Jan 2026 02:06:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6R-0006mr-HG for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdk6P-0006bz-7T for qemu-devel@nongnu.org; Thu, 08 Jan 2026 02:06:39 -0500 Received: from mx-prod-mc-06.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-518-rLQxOAvZPjeLgFiEdHST5g-1; Thu, 08 Jan 2026 02:06:35 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 217461800365; Thu, 8 Jan 2026 07:06:34 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.32]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D51071800980; Thu, 8 Jan 2026 07:06:33 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 354C521E66CC; Thu, 08 Jan 2026 08:06:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767855996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBdzRkZameKTVyrA0KTWn3oMxDovyCVEyuheC2ocBx0=; b=cR6OKLoTbr5HKXC/kljiY4ouzo9UiZEQ1lQ7OTWsnFFEZH1Jg03mIwgBlglxZHYNojTW6a PC/RSjMmcsSB2mFW9Y0IECBG3O8CkjCx61t/GHNSTYFEKDQp6s2nvpvAP8Vf8f19Pq59gl tQuRs6G7s/IIEExmSSb0Y9Prf4+lefo= X-MC-Unique: rLQxOAvZPjeLgFiEdHST5g-1 X-Mimecast-MFC-AGG-ID: rLQxOAvZPjeLgFiEdHST5g_1767855994 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL v2 17/17] block/file-win32: Improve an error message Date: Thu, 8 Jan 2026 08:06:25 +0100 Message-ID: <20260108070625.1586474-18-armbru@redhat.com> In-Reply-To: <20260108070625.1586474-1-armbru@redhat.com> References: <20260108070625.1586474-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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 (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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767856652901158500 Two out of three calls of CreateFile() use error_setg_win32() to report errors. The third uses error_setg_errno(), mapping ERROR_ACCESS_DENIED to EACCES, and everything else to EINVAL, throwing away detail. Switch it to error_setg_win32(). Signed-off-by: Markus Armbruster Message-ID: <20251121121438.1249498-16-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/file-win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/file-win32.c b/block/file-win32.c index b00039bf94..b63ce1c189 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -872,7 +872,7 @@ static int hdev_open(BlockDriverState *bs, QDict *optio= ns, int flags, } else { ret =3D -EINVAL; } - error_setg_errno(errp, -ret, "Could not open device"); + error_setg_win32(errp, err, "Could not open device"); goto done; } =20 --=20 2.52.0