From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMzIm-0002zJ-0D for qemu-devel@nongnu.org; Fri, 20 Sep 2013 07:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VMzIf-0000AU-H6 for qemu-devel@nongnu.org; Fri, 20 Sep 2013 07:55:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMzIf-00008a-8X for qemu-devel@nongnu.org; Fri, 20 Sep 2013 07:55:05 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8KBt4wG023226 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 20 Sep 2013 07:55:04 -0400 From: Kevin Wolf Date: Fri, 20 Sep 2013 13:54:30 +0200 Message-Id: <1379678070-14346-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1379678070-14346-1-git-send-email-kwolf@redhat.com> References: <1379678070-14346-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/17] blockdev: blockdev_init() error conversion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com This gives us meaningful error messages for the blockdev-add QMP command. Signed-off-by: Kevin Wolf --- blockdev.c | 59 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/blockdev.c b/blockdev.c index ef00c6d..fd2ef7a 100644 --- a/blockdev.c +++ b/blockdev.c @@ -269,7 +269,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; @@ -280,8 +280,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; } } @@ -306,7 +306,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; @@ -330,15 +331,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; } @@ -358,7 +357,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; } } @@ -380,7 +379,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; } } @@ -397,9 +396,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; } @@ -436,20 +436,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; } } @@ -461,8 +461,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 +516,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; } @@ -863,9 +865,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 */ @@ -2152,7 +2160,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 */ @@ -2186,9 +2193,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