From nobody Thu Oct 30 05:26:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525297045732739.4031173819029; Wed, 2 May 2018 14:37:25 -0700 (PDT) Received: from localhost ([::1]:52651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDzRE-0002k8-R7 for importer@patchew.org; Wed, 02 May 2018 17:37:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDzMc-0007X5-JY for qemu-devel@nongnu.org; Wed, 02 May 2018 17:32:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDzMb-0000OC-Ml for qemu-devel@nongnu.org; Wed, 02 May 2018 17:32:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39920 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDzMZ-0000M3-1o; Wed, 02 May 2018 17:32:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67F32406C78A; Wed, 2 May 2018 21:32:34 +0000 (UTC) Received: from localhost (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 147802166BAD; Wed, 2 May 2018 21:32:33 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 2 May 2018 23:32:17 +0200 Message-Id: <20180502213219.7842-6-mreitz@redhat.com> In-Reply-To: <20180502213219.7842-1-mreitz@redhat.com> References: <20180502213219.7842-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 02 May 2018 21:32:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 02 May 2018 21:32:34 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC 5/7] block: Add blk_new_open_string_opts() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is an interface to bdrv_open_string_opts(). Signed-off-by: Max Reitz --- include/sysemu/block-backend.h | 2 ++ block/block-backend.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 92ab624fac..1ad002fa7e 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -79,6 +79,8 @@ typedef struct BlockBackendPublic { BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm); BlockBackend *blk_new_open(const char *filename, const char *reference, QDict *options, int flags, Error **errp); +BlockBackend *blk_new_open_string_opts(const char *filename, QDict *option= s, + int flags, Error **errp); int blk_get_refcnt(BlockBackend *blk); void blk_ref(BlockBackend *blk); void blk_unref(BlockBackend *blk); diff --git a/block/block-backend.c b/block/block-backend.c index 89f47b00ea..fd3024602a 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -105,6 +105,11 @@ static const AIOCBInfo block_backend_aiocb_info =3D { static void drive_info_del(DriveInfo *dinfo); static BlockBackend *bdrv_first_blk(BlockDriverState *bs); =20 +static BlockBackend *blk_do_new_open(const char *filename, + const char *reference, QDict *options, + int flags, bool string_opts, + Error **errp); + /* All BlockBackends */ static QTAILQ_HEAD(, BlockBackend) block_backends =3D QTAILQ_HEAD_INITIALIZER(block_backends); @@ -348,6 +353,24 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_p= erm) */ BlockBackend *blk_new_open(const char *filename, const char *reference, QDict *options, int flags, Error **errp) +{ + return blk_do_new_open(filename, reference, options, flags, false, err= p); +} + +/* + * Like blk_new_open(), but accepts an @options QDict where some (or + * all) values are strings instead of their correct type. + */ +BlockBackend *blk_new_open_string_opts(const char *filename, QDict *option= s, + int flags, Error **errp) +{ + return blk_do_new_open(filename, NULL, options, flags, true, errp); +} + +static BlockBackend *blk_do_new_open(const char *filename, + const char *reference, QDict *options, + int flags, bool string_opts, + Error **errp) { BlockBackend *blk; BlockDriverState *bs; @@ -372,7 +395,12 @@ BlockBackend *blk_new_open(const char *filename, const= char *reference, } =20 blk =3D blk_new(perm, BLK_PERM_ALL); - bs =3D bdrv_open(filename, reference, options, flags, errp); + if (string_opts) { + assert(!reference); + bs =3D bdrv_open_string_opts(filename, options, flags, errp); + } else { + bs =3D bdrv_open(filename, reference, options, flags, errp); + } if (!bs) { blk_unref(blk); return NULL; --=20 2.14.3