From nobody Mon Feb 9 19:30:44 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