From a36c6beb5f5a2a02f805bcbf6303e3c6ab908c95 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Fri, 15 Mar 2019 18:10:05 +0100

Subject: [PATCH 009/163] file-posix: Use error API properly

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20190315181010.14964-10-kwolf@redhat.com>

Patchwork-id: 84886

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 09/14] file-posix: Use error API properly

Bugzilla: 1685989

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Fam Zheng <famz@redhat.com>

Use error_report for situations that affect user operation (i.e.  we're

actually returning error), and warn_report/warn_report_err when some

less critical error happened but the user operation can still carry on.

For raw_normalize_devicepath, add Error parameter to propagate to

its callers.

Suggested-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit db0754df88e3ca4797539c1edbde596d871b64b6)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/file-posix.c | 39 ++++++++++++++++-----------------------

 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c

index deecf58..419781c 100644

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -207,7 +207,7 @@ static int cdrom_reopen(BlockDriverState *bs);

 #endif

 #if defined(__NetBSD__)

-static int raw_normalize_devicepath(const char **filename)

+static int raw_normalize_devicepath(const char **filename, Error **errp)

 {

     static char namebuf[PATH_MAX];

     const char *dp, *fname;

@@ -216,8 +216,7 @@ static int raw_normalize_devicepath(const char **filename)

     fname = *filename;

     dp = strrchr(fname, '/');

     if (lstat(fname, &sb) < 0) {

-        fprintf(stderr, "%s: stat failed: %s\n",

-            fname, strerror(errno));

+        error_setg_errno(errp, errno, "%s: stat failed", fname);

         return -errno;

     }

@@ -231,14 +230,13 @@ static int raw_normalize_devicepath(const char **filename)

         snprintf(namebuf, PATH_MAX, "%.*s/r%s",

             (int)(dp - fname), fname, dp + 1);

     }

-    fprintf(stderr, "%s is a block device", fname);

     *filename = namebuf;

-    fprintf(stderr, ", using %s\n", *filename);

+    warn_report("%s is a block device, using %s", fname, *filename);

     return 0;

 }

 #else

-static int raw_normalize_devicepath(const char **filename)

+static int raw_normalize_devicepath(const char **filename, Error **errp)

 {

     return 0;

 }

@@ -458,9 +456,8 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,

     filename = qemu_opt_get(opts, "filename");

-    ret = raw_normalize_devicepath(&filename);

+    ret = raw_normalize_devicepath(&filename, errp);

     if (ret != 0) {

-        error_setg_errno(errp, -ret, "Could not normalize device path");

         goto fail;

     }

@@ -489,11 +486,10 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,

     case ON_OFF_AUTO_ON:

         s->use_lock = true;

         if (!qemu_has_ofd_lock()) {

-            fprintf(stderr,

-                    "File lock requested but OFD locking syscall is "

-                    "unavailable, falling back to POSIX file locks.\n"

-                    "Due to the implementation, locks can be lost "

-                    "unexpectedly.\n");

+            warn_report("File lock requested but OFD locking syscall is "

+                        "unavailable, falling back to POSIX file locks");

+            error_printf("Due to the implementation, locks can be lost "

+                         "unexpectedly.\n");

         }

         break;

     case ON_OFF_AUTO_OFF:

@@ -821,7 +817,7 @@ static int raw_handle_perm_lock(BlockDriverState *bs,

             /* Theoretically the above call only unlocks bytes and it cannot

              * fail. Something weird happened, report it.

              */

-            error_report_err(local_err);

+            warn_report_err(local_err);

         }

         break;

     case RAW_PL_COMMIT:

@@ -831,7 +827,7 @@ static int raw_handle_perm_lock(BlockDriverState *bs,

             /* Theoretically the above call only unlocks bytes and it cannot

              * fail. Something weird happened, report it.

              */

-            error_report_err(local_err);

+            warn_report_err(local_err);

         }

         break;

     }

@@ -891,10 +887,8 @@ static int raw_reopen_prepare(BDRVReopenState *state,

     /* If we cannot use fcntl, or fcntl failed, fall back to qemu_open() */

     if (rs->fd == -1) {

         const char *normalized_filename = state->bs->filename;

-        ret = raw_normalize_devicepath(&normalized_filename);

-        if (ret < 0) {

-            error_setg_errno(errp, -ret, "Could not normalize device path");

-        } else {

+        ret = raw_normalize_devicepath(&normalized_filename, errp);

+        if (ret >= 0) {

             assert(!(rs->open_flags & O_CREAT));

             rs->fd = qemu_open(normalized_filename, rs->open_flags);

             if (rs->fd == -1) {

@@ -1742,7 +1736,7 @@ static int aio_worker(void *arg)

         ret = handle_aiocb_truncate(aiocb);

         break;

     default:

-        fprintf(stderr, "invalid aio request (0x%x)\n", aiocb->aio_type);

+        error_report("invalid aio request (0x%x)", aiocb->aio_type);

         ret = -EINVAL;

         break;

     }

@@ -2233,7 +2227,7 @@ out_unlock:

          * not mean the whole creation operation has failed.  So

          * report it the user for their convenience, but do not report

          * it to the caller. */

-        error_report_err(local_err);

+        warn_report_err(local_err);

     }

 out_close:

@@ -2986,9 +2980,8 @@ static int coroutine_fn hdev_co_create_opts(const char *filename, QemuOpts *opts

     (void)has_prefix;

-    ret = raw_normalize_devicepath(&filename);

+    ret = raw_normalize_devicepath(&filename, errp);

     if (ret < 0) {

-        error_setg_errno(errp, -ret, "Could not normalize device path");

         return ret;

     }

-- 

1.8.3.1