From patchwork Wed Feb 27 17:25:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 223659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AC9AA2C0086 for ; Thu, 28 Feb 2013 04:29:05 +1100 (EST) Received: from localhost ([::1]:59876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAkoO-0003ay-6N for incoming@patchwork.ozlabs.org; Wed, 27 Feb 2013 12:29:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAkm8-0008In-KD for qemu-devel@nongnu.org; Wed, 27 Feb 2013 12:26:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAklt-0003Ae-Fk for qemu-devel@nongnu.org; Wed, 27 Feb 2013 12:26:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAklt-000374-83 for qemu-devel@nongnu.org; Wed, 27 Feb 2013 12:26:25 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1RHQDKY014835 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 27 Feb 2013 12:26:13 -0500 Received: from dhcp-200-207.str.redhat.com (ovpn-116-66.ams2.redhat.com [10.36.116.66]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1RHQ21l024183; Wed, 27 Feb 2013 12:26:12 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 27 Feb 2013 18:25:54 +0100 Message-Id: <1361985955-15118-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1361985955-15118-1-git-send-email-kwolf@redhat.com> References: <1361985955-15118-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [RFC PATCH 5/6] block: Support driver specific options in drive_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Any non-default -drive options are now passed down to the block drivers. Signed-off-by: Kevin Wolf --- blockdev.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index f13f829..d6680a1 100644 --- a/blockdev.c +++ b/blockdev.c @@ -22,6 +22,7 @@ #include "sysemu/arch_init.h" static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives); +extern QemuOptsList qemu_common_drive_opts; static const char *const if_name[IF_COUNT] = { [IF_NONE] = "none", @@ -287,7 +288,26 @@ static bool do_check_io_limits(BlockIOLimit *io_limits, Error **errp) return true; } -DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type) +typedef struct AddCommonOptsData { + QemuOpts *opts; + QDict *bs_opts; +} AddCommonOptsData; + +static int add_common_opts_cb(const char *name, const char *val, void *opaque) +{ + AddCommonOptsData *d = opaque; + Error *errp = NULL; + + qemu_opt_set_err(d->opts, name, val, &errp); + if (error_is_set(&errp)) { + qdict_put(d->bs_opts, name, qstring_from_str(val)); + error_free(errp); + } + + return 0; +} + +DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) { const char *buf; const char *file = NULL; @@ -310,10 +330,25 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type) bool copy_on_read; int ret; Error *error = NULL; + QemuOpts *opts; + QDict *bs_opts; + AddCommonOptsData add_common_opts_data; translation = BIOS_ATA_TRANSLATION_AUTO; media = MEDIA_DISK; + /* Check common options by copying from all_opts to opts, all other options + * are stored in bs_opts. */ + opts = qemu_opts_create_nofail(&qemu_common_drive_opts); + bs_opts = qdict_new(); + + add_common_opts_data = (AddCommonOptsData) { + .opts = opts, + .bs_opts = bs_opts, + }; + + qemu_opt_foreach(all_opts, add_common_opts_cb, &add_common_opts_data, true); + /* extract parameters */ bus_id = qemu_opt_get_number(opts, "bus", 0); unit_id = qemu_opt_get_number(opts, "unit", -1); @@ -628,7 +663,7 @@ DriveInfo *drive_init(QemuOpts *opts, BlockInterfaceType block_default_type) error_report("warning: disabling copy_on_read on readonly drive"); } - ret = bdrv_open(dinfo->bdrv, file, NULL, bdrv_flags, drv); + ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, drv); if (ret < 0) { if (ret == -EMEDIUMTYPE) { error_report("could not open disk image %s: not in %s format", @@ -1454,9 +1489,9 @@ BlockJobInfoList *qmp_query_block_jobs(Error **errp) return dummy.next; } -QemuOptsList qemu_drive_opts = { +QemuOptsList qemu_common_drive_opts = { .name = "drive", - .head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head), + .head = QTAILQ_HEAD_INITIALIZER(qemu_common_drive_opts.head), .desc = { { .name = "bus", @@ -1571,3 +1606,15 @@ QemuOptsList qemu_drive_opts = { { /* end of list */ } }, }; + +QemuOptsList qemu_drive_opts = { + .name = "drive", + .head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head), + .desc = { + /* + * no elements => accept any params + * validation will happen later + */ + { /* end of list */ } + }, +};