From 8e44095beac9a5c6da5e91339c5cf7746afaa623 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Thu, 7 Nov 2013 12:53:07 +0100

Subject: [PATCH 61/87] blockdev: blockdev_init() error conversion

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

Message-id: <1383660558-32096-21-git-send-email-kwolf@redhat.com>

Patchwork-id: 55399

O-Subject: [RHEL-7.0 qemu-kvm PATCH 20/24] blockdev: blockdev_init() error conversion

Bugzilla: 978402

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

This gives us meaningful error messages for the blockdev-add QMP

command.

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

Reviewed-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit b681072d2005911b79835d2a6af208eba3983a48)

Conflicts:

	blockdev.c

Conflict caused by do_check_io_limits(), which has been replaced by

check_throttle_config() in upstream (commit cc0681c4 'block: Enable the

new throttling code in the block layer.')

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

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

---

 blockdev.c |   56 +++++++++++++++++++++++++++++++-------------------------

 1 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/blockdev.c b/blockdev.c

index cbf01eb..a248480 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -275,7 +275,7 @@ static void drive_put_ref_bh_schedule(DriveInfo *dinfo)

 }

 #endif

-static int parse_block_error_action(const char *buf, bool is_read)

+static int parse_block_error_action(const char *buf, bool is_read, Error **errp)

 {

     if (!strcmp(buf, "ignore")) {

         return BLOCKDEV_ON_ERROR_IGNORE;

@@ -286,8 +286,8 @@ static int parse_block_error_action(const char *buf, bool is_read)

     } else if (!strcmp(buf, "report")) {

         return BLOCKDEV_ON_ERROR_REPORT;

     } else {

-        error_report("'%s' invalid %s error action",

-                     buf, is_read ? "read" : "write");

+        error_setg(errp, "'%s' invalid %s error action",

+                   buf, is_read ? "read" : "write");

         return -1;

     }

 }

@@ -328,7 +328,8 @@ typedef enum { MEDIA_DISK, MEDIA_CDROM } DriveMediaType;

 /* Takes the ownership of bs_opts */

 static DriveInfo *blockdev_init(QDict *bs_opts,

-                                BlockInterfaceType type)

+                                BlockInterfaceType type,

+                                Error **errp)

 {

     const char *buf;

     const char *file = NULL;

@@ -352,15 +353,13 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

     id = qdict_get_try_str(bs_opts, "id");

     opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error);

     if (error_is_set(&error)) {

-        qerror_report_err(error);

-        error_free(error);

+        error_propagate(errp, error);

         return NULL;

     }

     qemu_opts_absorb_qdict(opts, bs_opts, &error);

     if (error_is_set(&error)) {

-        qerror_report_err(error);

-        error_free(error);

+        error_propagate(errp, error);

         return NULL;

     }

@@ -380,7 +379,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

     if ((buf = qemu_opt_get(opts, "discard")) != NULL) {

         if (bdrv_parse_discard_flags(buf, &bdrv_flags) != 0) {

-            error_report("invalid discard option");

+            error_setg(errp, "invalid discard option");

             return NULL;

         }

     }

@@ -403,7 +402,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

         } else if (!strcmp(buf, "threads")) {

             /* this is the default */

         } else {

-           error_report("invalid aio option");

+           error_setg(errp, "invalid aio option");

            return NULL;

         }

     }

@@ -419,7 +418,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

         drv = bdrv_find_whitelisted_format(buf, ro);

         if (!drv) {

-            error_report("'%s' invalid format", buf);

+            error_setg(errp, "'%s' invalid format", buf);

             return NULL;

         }

     }

@@ -439,20 +438,20 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

         qemu_opt_get_number(opts, "throttling.iops-write", 0);

     if (!do_check_io_limits(&io_limits, &error)) {

-        error_report("%s", error_get_pretty(error));

-        error_free(error);

+        error_propagate(errp, error);

         return NULL;

     }

     on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;

     if ((buf = qemu_opt_get(opts, "werror")) != NULL) {

         if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {

-            error_report("werror is not supported by this bus type");

+            error_setg(errp, "werror is not supported by this bus type");

             return NULL;

         }

-        on_write_error = parse_block_error_action(buf, 0);

-        if (on_write_error < 0) {

+        on_write_error = parse_block_error_action(buf, 0, &error);

+        if (error_is_set(&error)) {

+            error_propagate(errp, error);

             return NULL;

         }

     }

@@ -464,8 +463,9 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

             return NULL;

         }

-        on_read_error = parse_block_error_action(buf, 1);

-        if (on_read_error < 0) {

+        on_read_error = parse_block_error_action(buf, 1, &error);

+        if (error_is_set(&error)) {

+            error_propagate(errp, error);

             return NULL;

         }

     }

@@ -515,8 +515,9 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

     ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, drv, &error);

     if (ret < 0) {

-        error_report("could not open disk image %s: %s",

-                     file ?: dinfo->id, error_get_pretty(error));

+        error_setg(errp, "could not open disk image %s: %s",

+                   file ?: dinfo->id, error_get_pretty(error));

+        error_free(error);

         goto err;

     }

@@ -852,9 +853,15 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)

     }

     /* Actual block device init: Functionality shared with blockdev-add */

-    dinfo = blockdev_init(bs_opts, type);

+    dinfo = blockdev_init(bs_opts, type, &local_err);

     if (dinfo == NULL) {

+        if (error_is_set(&local_err)) {

+            qerror_report_err(local_err);

+            error_free(local_err);

+        }

         goto fail;

+    } else {

+        assert(!error_is_set(&local_err));

     }

     /* Set legacy DriveInfo fields */

@@ -1745,7 +1752,6 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)

     QmpOutputVisitor *ov = qmp_output_visitor_new();

     QObject *obj;

     QDict *qdict;

-    DriveInfo *dinfo;

     Error *local_err = NULL;

     /* Require an ID in the top level */

@@ -1779,9 +1785,9 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)

     qdict_flatten(qdict);

-    dinfo = blockdev_init(qdict, IF_NONE);

-    if (!dinfo) {

-        error_setg(errp, "Could not open image");

+    blockdev_init(qdict, IF_NONE, &local_err);

+    if (error_is_set(&local_err)) {

+        error_propagate(errp, local_err);

         goto fail;

     }

-- 

1.7.1