qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	qemu-block@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v5 5/8] util: add Error object for qemu_open_internal error reporting
Date: Wed,  2 Sep 2020 18:09:10 +0100	[thread overview]
Message-ID: <20200902170913.1785194-6-berrange@redhat.com> (raw)
In-Reply-To: <20200902170913.1785194-1-berrange@redhat.com>

Instead of relying on the limited information from errno, we can now
also provide detailed error messages to callers that ask for it.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 util/osdep.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/util/osdep.c b/util/osdep.c
index dd34b58bb7..28aa89adc9 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -298,7 +298,7 @@ static int qemu_open_cloexec(const char *name, int flags, mode_t mode)
  * Opens a file with FD_CLOEXEC set
  */
 static int
-qemu_open_internal(const char *name, int flags, mode_t mode)
+qemu_open_internal(const char *name, int flags, mode_t mode, Error **errp)
 {
     int ret;
 
@@ -312,12 +312,15 @@ qemu_open_internal(const char *name, int flags, mode_t mode)
 
         fdset_id = qemu_parse_fdset(fdset_id_str);
         if (fdset_id == -1) {
+            error_setg(errp, "Could not parse fdset %s", name);
             errno = EINVAL;
             return -1;
         }
 
         dupfd = monitor_fdset_dup_fd_add(fdset_id, flags);
         if (dupfd == -1) {
+            error_setg_errno(errp, errno, "Could not dup FD for %s flags %x",
+                             name, flags);
             return -1;
         }
 
@@ -327,6 +330,13 @@ qemu_open_internal(const char *name, int flags, mode_t mode)
 
     ret = qemu_open_cloexec(name, flags, mode);
 
+    if (ret == -1) {
+        const char *action = flags & O_CREAT ? "create" : "open";
+        error_setg_errno(errp, errno, "Could not %s '%s'",
+                         action, name);
+    }
+
+
     return ret;
 }
 
@@ -343,7 +353,7 @@ int qemu_open_old(const char *name, int flags, ...)
     }
     va_end(ap);
 
-    ret = qemu_open_internal(name, flags, mode);
+    ret = qemu_open_internal(name, flags, mode, NULL);
 
 #ifdef O_DIRECT
     if (ret == -1 && errno == EINVAL && (flags & O_DIRECT)) {
-- 
2.26.2



  parent reply	other threads:[~2020-09-02 17:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-02 17:09 [PATCH v5 0/8] block: improve error reporting for unsupported O_DIRECT Daniel P. Berrangé
2020-09-02 17:09 ` [PATCH v5 1/8] monitor: simplify functions for getting a dup'd fdset entry Daniel P. Berrangé
2020-09-03  8:52   ` Markus Armbruster
2020-09-03 10:48     ` Daniel P. Berrangé
2020-09-02 17:09 ` [PATCH v5 2/8] util: split off a helper for dealing with O_CLOEXEC flag Daniel P. Berrangé
2020-09-03  8:53   ` Markus Armbruster
2020-09-02 17:09 ` [PATCH v5 3/8] util: rename qemu_open() to qemu_open_old() Daniel P. Berrangé
2020-09-03  8:54   ` Markus Armbruster
2020-09-02 17:09 ` [PATCH v5 4/8] util: refactor qemu_open_old to split off variadic args handling Daniel P. Berrangé
2020-09-03  9:00   ` Markus Armbruster
2020-09-02 17:09 ` Daniel P. Berrangé [this message]
2020-09-03  9:03   ` [PATCH v5 5/8] util: add Error object for qemu_open_internal error reporting Markus Armbruster
2020-09-03 10:54     ` Daniel P. Berrangé
2020-09-02 17:09 ` [PATCH v5 6/8] util: introduce qemu_open and qemu_create with " Daniel P. Berrangé
2020-09-02 17:09 ` [PATCH v5 7/8] util: give a specific error message when O_DIRECT doesn't work Daniel P. Berrangé
2020-09-02 17:09 ` [PATCH v5 8/8] block/file: switch to use qemu_open/qemu_create for improved errors Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200902170913.1785194-6-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=armbru@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).