From nobody Mon Feb 9 08:56:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593620059; cv=none; d=zohomail.com; s=zohoarc; b=C5ObB/YfE2GVILRbFOFs/n09ymDgkI2T4qNy+5Lls23mQhhClLk2n+PWwM89P/HD+0rX+9ZZyDJWl1ZgvA6UE0jjBzPayuC1NM9qKFwXY5RUexQlRyWk7mMQaMJogyTlLx3xMpJYMfgJRXvz201hrFTBsEbqb5/DbYGrwsAy78U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593620059; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6clJ9K3XBLp8GdGzUQ1X1i6FU4glV+t8wJxNhnZ6yNM=; b=Wn/LIdhFyIRVMSoQnDdGnLu1v0Vb185Yn0e9tEe6ulgVJHDlolvyKEhHl1NjNN9dJLpHQN0h0wo4s7Cro5JJYVtXIGGu7a85Gj2ycL/l2LGcfc1xjxavUnpVpHpgTgwdavtJmcO7TtwN3JxcGyha0Z1MP8Mz873BjgY69Uaqp5U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593620059189438.86080679077133; Wed, 1 Jul 2020 09:14:19 -0700 (PDT) Received: from localhost ([::1]:45352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqfNJ-0001ok-Sb for importer@patchew.org; Wed, 01 Jul 2020 12:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqfEk-0003E7-Ds for qemu-devel@nongnu.org; Wed, 01 Jul 2020 12:05:26 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:20000) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqfEd-000581-UX for qemu-devel@nongnu.org; Wed, 01 Jul 2020 12:05:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-20-tX6yP5cBNm6QU9ixWMuCCg-1; Wed, 01 Jul 2020 12:05:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 721D41B18BE0; Wed, 1 Jul 2020 16:05:16 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id C20F52B4B6; Wed, 1 Jul 2020 16:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593619519; 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=6clJ9K3XBLp8GdGzUQ1X1i6FU4glV+t8wJxNhnZ6yNM=; b=HEhdRz+GzK3zAqthaogfKmBJ8YcW6RYs7HsHn+yBopau3hLnh6HsjxGf7UNg/O+c6mlmb3 oMmCy91yKiclSty2AdyTJ6uiK0bP7RMfA76tEsDZGW3SfBrx2n+bBBdhXDGbhkpqnSN9hY CExXaqwfzDWBKvb6CHQ1zl03NmW/7nI= X-MC-Unique: tX6yP5cBNm6QU9ixWMuCCg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] util: support detailed error reporting for qemu_open Date: Wed, 1 Jul 2020 17:05:08 +0100 Message-Id: <20200701160509.1523847-3-berrange@redhat.com> In-Reply-To: <20200701160509.1523847-1-berrange@redhat.com> References: <20200701160509.1523847-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=berrange@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/01 01:05:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , P J P , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Create a "qemu_open_err" method which does the same as "qemu_open", but with a "Error **errp" for error reporting. There should be no behavioural difference for existing callers at this stage. Signed-off-by: Daniel P. Berrang=C3=A9 --- include/qemu/osdep.h | 1 + util/osdep.c | 71 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 0d26a1b9bd..e41701a308 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -483,6 +483,7 @@ int qemu_madvise(void *addr, size_t len, int advice); int qemu_mprotect_rwx(void *addr, size_t size); int qemu_mprotect_none(void *addr, size_t size); =20 +int qemu_open_err(const char *name, int flags, Error **errp, ...); int qemu_open(const char *name, int flags, ...); int qemu_close(int fd); int qemu_unlink(const char *name); diff --git a/util/osdep.c b/util/osdep.c index 4bdbe81cec..450b3a5da3 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qapi/error.h" =20 /* Needed early for CONFIG_BSD etc. */ =20 @@ -282,7 +283,7 @@ int qemu_lock_fd_test(int fd, int64_t start, int64_t le= n, bool exclusive) /* * Opens a file with FD_CLOEXEC set */ -int qemu_open(const char *name, int flags, ...) +static int qemu_openv(const char *name, int flags, Error **errp, va_list a= p) { int ret; int mode =3D 0; @@ -297,24 +298,31 @@ int qemu_open(const char *name, int flags, ...) =20 fdset_id =3D qemu_parse_fdset(fdset_id_str); if (fdset_id =3D=3D -1) { + error_setg(errp, "Unable to parse fdset %s", name); errno =3D EINVAL; return -1; } =20 fd =3D monitor_fdset_get_fd(fdset_id, flags); if (fd < 0) { + error_setg_errno(errp, -fd, "Unable acquire FD for %s flags %x= ", + name, flags); errno =3D -fd; return -1; } =20 dupfd =3D qemu_dup_flags(fd, flags); if (dupfd =3D=3D -1) { + error_setg_errno(errp, errno, "Unable dup FD for %s flags %x", + name, flags); return -1; } =20 ret =3D monitor_fdset_dup_fd_add(fdset_id, dupfd); if (ret =3D=3D -1) { close(dupfd); + error_setg(errp, "Unable save FD for %s flags %x", + name, flags); errno =3D EINVAL; return -1; } @@ -324,11 +332,7 @@ int qemu_open(const char *name, int flags, ...) #endif =20 if (flags & O_CREAT) { - va_list ap; - - va_start(ap, flags); mode =3D va_arg(ap, int); - va_end(ap); } =20 #ifdef O_CLOEXEC @@ -340,25 +344,64 @@ int qemu_open(const char *name, int flags, ...) } #endif =20 + if (ret =3D=3D -1) { + const char *action =3D "open"; + if (flags & O_CREAT) { + action =3D "create"; + } #ifdef O_DIRECT - if (ret =3D=3D -1 && errno =3D=3D EINVAL && (flags & O_DIRECT)) { - int newflags =3D flags & ~O_DIRECT; + if (errno =3D=3D EINVAL && (flags & O_DIRECT)) { + int newflags =3D flags & ~O_DIRECT; # ifdef O_CLOEXEC - ret =3D open(name, newflags | O_CLOEXEC, mode); + ret =3D open(name, newflags | O_CLOEXEC, mode); # else - ret =3D open(name, newflags, mode); + ret =3D open(name, newflags, mode); # endif - if (ret !=3D -1) { - close(ret); - error_report("file system does not support O_DIRECT"); - errno =3D EINVAL; + if (ret !=3D -1) { + close(ret); + error_setg(errp, "Unable to %s '%s' flags 0x%x: " + "filesystem does not support O_DIRECT", + action, name, flags); + if (!errp) { + error_report("file system does not support O_DIRECT"); + } + errno =3D EINVAL; + return -1; + } } - } #endif /* O_DIRECT */ + error_setg_errno(errp, errno, "Unable to %s '%s' flags 0x%x", + action, name, flags); + } + =20 return ret; } =20 +int qemu_open_err(const char *name, int flags, Error **errp, ...) +{ + va_list ap; + int rv; + + va_start(ap, errp); + rv =3D qemu_openv(name, flags, errp, ap); + va_end(ap); + + return rv; +} + +int qemu_open(const char *name, int flags, ...) +{ + va_list ap; + int rv; + + va_start(ap, flags); + rv =3D qemu_openv(name, flags, NULL, ap); + va_end(ap); + + return rv; +} + int qemu_close(int fd) { int64_t fdset_id; --=20 2.26.2