[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/17] blockdev: blockdev_init() error conversion
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v3 17/17] blockdev: blockdev_init() error conversion |
Date: |
Tue, 8 Oct 2013 14:16:34 +0200 |
This gives us meaningful error messages for the blockdev-add QMP
command.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
blockdev.c | 59 +++++++++++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 26 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 61dbf26..835c8c3 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -272,7 +272,7 @@ static void bdrv_put_ref_bh_schedule(BlockDriverState *bs)
qemu_bh_schedule(s->bh);
}
-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;
@@ -283,8 +283,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;
}
}
@@ -309,7 +309,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;
@@ -333,15 +334,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;
}
@@ -361,7 +360,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;
}
}
@@ -383,7 +382,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;
}
}
@@ -400,9 +399,10 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
drv = bdrv_find_whitelisted_format(buf, ro);
if (!drv) {
if (!ro && bdrv_find_whitelisted_format(buf, !ro)) {
- error_report("'%s' can be only used as read-only device.",
buf);
+ error_setg(errp, "'%s' can be only used as read-only device.",
+ buf);
} else {
- error_report("'%s' invalid format", buf);
+ error_setg(errp, "'%s' invalid format", buf);
}
return NULL;
}
@@ -439,20 +439,20 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
cfg.op_size = qemu_opt_get_number(opts, "throttling.iops-size", 0);
if (!check_throttle_config(&cfg, &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 +464,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;
}
}
@@ -518,8 +519,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;
}
@@ -866,9 +868,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 */
@@ -2155,7 +2163,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 */
@@ -2189,9 +2196,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.8.1.4
- [Qemu-devel] [PATCH v3 07/17] blockdev: Move parsing of 'media' option to drive_init, (continued)
- [Qemu-devel] [PATCH v3 07/17] blockdev: Move parsing of 'media' option to drive_init, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 08/17] blockdev: Move parsing of 'if' option to drive_init, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 09/17] blockdev: Moving parsing of geometry options to drive_init, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 10/17] blockdev: Move parsing of 'boot' option to drive_init, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 11/17] blockdev: Move bus/unit/index processing to drive_init, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 12/17] blockdev: Move virtio-blk device creation to drive_init, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 13/17] blockdev: Remove IF_* check for read-only blockdev_init, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 14/17] qemu-iotests: Check autodel behaviour for device_del, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 15/17] blockdev: Remove 'media' parameter from blockdev_init(), Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 16/17] blockdev: Don't disable COR automatically with blockdev-add, Kevin Wolf, 2013/10/08
- [Qemu-devel] [PATCH v3 17/17] blockdev: blockdev_init() error conversion,
Kevin Wolf <=