cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 8e44095beac9a5c6da5e91339c5cf7746afaa623 Mon Sep 17 00:00:00 2001
218e99
From: Kevin Wolf <kwolf@redhat.com>
218e99
Date: Thu, 7 Nov 2013 12:53:07 +0100
218e99
Subject: [PATCH 61/87] blockdev: blockdev_init() error conversion
218e99
218e99
RH-Author: Kevin Wolf <kwolf@redhat.com>
218e99
Message-id: <1383660558-32096-21-git-send-email-kwolf@redhat.com>
218e99
Patchwork-id: 55399
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH 20/24] blockdev: blockdev_init() error conversion
218e99
Bugzilla: 978402
218e99
RH-Acked-by: Fam Zheng <famz@redhat.com>
218e99
RH-Acked-by: Max Reitz <mreitz@redhat.com>
218e99
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
218e99
218e99
This gives us meaningful error messages for the blockdev-add QMP
218e99
command.
218e99
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
Reviewed-by: Max Reitz <mreitz@redhat.com>
218e99
Reviewed-by: Eric Blake <eblake@redhat.com>
218e99
(cherry picked from commit b681072d2005911b79835d2a6af208eba3983a48)
218e99
218e99
Conflicts:
218e99
	blockdev.c
218e99
218e99
Conflict caused by do_check_io_limits(), which has been replaced by
218e99
check_throttle_config() in upstream (commit cc0681c4 'block: Enable the
218e99
new throttling code in the block layer.')
218e99
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 blockdev.c |   56 +++++++++++++++++++++++++++++++-------------------------
218e99
 1 files changed, 31 insertions(+), 25 deletions(-)
218e99
218e99
diff --git a/blockdev.c b/blockdev.c
218e99
index cbf01eb..a248480 100644
218e99
--- a/blockdev.c
218e99
+++ b/blockdev.c
218e99
@@ -275,7 +275,7 @@ static void drive_put_ref_bh_schedule(DriveInfo *dinfo)
218e99
 }
218e99
 #endif
218e99
 
218e99
-static int parse_block_error_action(const char *buf, bool is_read)
218e99
+static int parse_block_error_action(const char *buf, bool is_read, Error **errp)
218e99
 {
218e99
     if (!strcmp(buf, "ignore")) {
218e99
         return BLOCKDEV_ON_ERROR_IGNORE;
218e99
@@ -286,8 +286,8 @@ static int parse_block_error_action(const char *buf, bool is_read)
218e99
     } else if (!strcmp(buf, "report")) {
218e99
         return BLOCKDEV_ON_ERROR_REPORT;
218e99
     } else {
218e99
-        error_report("'%s' invalid %s error action",
218e99
-                     buf, is_read ? "read" : "write");
218e99
+        error_setg(errp, "'%s' invalid %s error action",
218e99
+                   buf, is_read ? "read" : "write");
218e99
         return -1;
218e99
     }
218e99
 }
218e99
@@ -328,7 +328,8 @@ typedef enum { MEDIA_DISK, MEDIA_CDROM } DriveMediaType;
218e99
 
218e99
 /* Takes the ownership of bs_opts */
218e99
 static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
-                                BlockInterfaceType type)
218e99
+                                BlockInterfaceType type,
218e99
+                                Error **errp)
218e99
 {
218e99
     const char *buf;
218e99
     const char *file = NULL;
218e99
@@ -352,15 +353,13 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
     id = qdict_get_try_str(bs_opts, "id");
218e99
     opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error);
218e99
     if (error_is_set(&error)) {
218e99
-        qerror_report_err(error);
218e99
-        error_free(error);
218e99
+        error_propagate(errp, error);
218e99
         return NULL;
218e99
     }
218e99
 
218e99
     qemu_opts_absorb_qdict(opts, bs_opts, &error);
218e99
     if (error_is_set(&error)) {
218e99
-        qerror_report_err(error);
218e99
-        error_free(error);
218e99
+        error_propagate(errp, error);
218e99
         return NULL;
218e99
     }
218e99
 
218e99
@@ -380,7 +379,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
 
218e99
     if ((buf = qemu_opt_get(opts, "discard")) != NULL) {
218e99
         if (bdrv_parse_discard_flags(buf, &bdrv_flags) != 0) {
218e99
-            error_report("invalid discard option");
218e99
+            error_setg(errp, "invalid discard option");
218e99
             return NULL;
218e99
         }
218e99
     }
218e99
@@ -403,7 +402,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
         } else if (!strcmp(buf, "threads")) {
218e99
             /* this is the default */
218e99
         } else {
218e99
-           error_report("invalid aio option");
218e99
+           error_setg(errp, "invalid aio option");
218e99
            return NULL;
218e99
         }
218e99
     }
218e99
@@ -419,7 +418,7 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
 
218e99
         drv = bdrv_find_whitelisted_format(buf, ro);
218e99
         if (!drv) {
218e99
-            error_report("'%s' invalid format", buf);
218e99
+            error_setg(errp, "'%s' invalid format", buf);
218e99
             return NULL;
218e99
         }
218e99
     }
218e99
@@ -439,20 +438,20 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
         qemu_opt_get_number(opts, "throttling.iops-write", 0);
218e99
 
218e99
     if (!do_check_io_limits(&io_limits, &error)) {
218e99
-        error_report("%s", error_get_pretty(error));
218e99
-        error_free(error);
218e99
+        error_propagate(errp, error);
218e99
         return NULL;
218e99
     }
218e99
 
218e99
     on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;
218e99
     if ((buf = qemu_opt_get(opts, "werror")) != NULL) {
218e99
         if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {
218e99
-            error_report("werror is not supported by this bus type");
218e99
+            error_setg(errp, "werror is not supported by this bus type");
218e99
             return NULL;
218e99
         }
218e99
 
218e99
-        on_write_error = parse_block_error_action(buf, 0);
218e99
-        if (on_write_error < 0) {
218e99
+        on_write_error = parse_block_error_action(buf, 0, &error);
218e99
+        if (error_is_set(&error)) {
218e99
+            error_propagate(errp, error);
218e99
             return NULL;
218e99
         }
218e99
     }
218e99
@@ -464,8 +463,9 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
             return NULL;
218e99
         }
218e99
 
218e99
-        on_read_error = parse_block_error_action(buf, 1);
218e99
-        if (on_read_error < 0) {
218e99
+        on_read_error = parse_block_error_action(buf, 1, &error);
218e99
+        if (error_is_set(&error)) {
218e99
+            error_propagate(errp, error);
218e99
             return NULL;
218e99
         }
218e99
     }
218e99
@@ -515,8 +515,9 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
218e99
     ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, drv, &error);
218e99
 
218e99
     if (ret < 0) {
218e99
-        error_report("could not open disk image %s: %s",
218e99
-                     file ?: dinfo->id, error_get_pretty(error));
218e99
+        error_setg(errp, "could not open disk image %s: %s",
218e99
+                   file ?: dinfo->id, error_get_pretty(error));
218e99
+        error_free(error);
218e99
         goto err;
218e99
     }
218e99
 
218e99
@@ -852,9 +853,15 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
218e99
     }
218e99
 
218e99
     /* Actual block device init: Functionality shared with blockdev-add */
218e99
-    dinfo = blockdev_init(bs_opts, type);
218e99
+    dinfo = blockdev_init(bs_opts, type, &local_err);
218e99
     if (dinfo == NULL) {
218e99
+        if (error_is_set(&local_err)) {
218e99
+            qerror_report_err(local_err);
218e99
+            error_free(local_err);
218e99
+        }
218e99
         goto fail;
218e99
+    } else {
218e99
+        assert(!error_is_set(&local_err));
218e99
     }
218e99
 
218e99
     /* Set legacy DriveInfo fields */
218e99
@@ -1745,7 +1752,6 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)
218e99
     QmpOutputVisitor *ov = qmp_output_visitor_new();
218e99
     QObject *obj;
218e99
     QDict *qdict;
218e99
-    DriveInfo *dinfo;
218e99
     Error *local_err = NULL;
218e99
 
218e99
     /* Require an ID in the top level */
218e99
@@ -1779,9 +1785,9 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)
218e99
 
218e99
     qdict_flatten(qdict);
218e99
 
218e99
-    dinfo = blockdev_init(qdict, IF_NONE);
218e99
-    if (!dinfo) {
218e99
-        error_setg(errp, "Could not open image");
218e99
+    blockdev_init(qdict, IF_NONE, &local_err);
218e99
+    if (error_is_set(&local_err)) {
218e99
+        error_propagate(errp, local_err);
218e99
         goto fail;
218e99
     }
218e99
 
218e99
-- 
218e99
1.7.1
218e99