From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aItO6-0005NH-7A for qemu-devel@nongnu.org; Tue, 12 Jan 2016 02:29:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aItO1-0000K9-W4 for qemu-devel@nongnu.org; Tue, 12 Jan 2016 02:29:06 -0500 Received: from e06smtp07.uk.ibm.com ([195.75.94.103]:47726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aItO1-0000Jt-M5 for qemu-devel@nongnu.org; Tue, 12 Jan 2016 02:29:01 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jan 2016 07:28:59 -0000 References: <1452537156-7683-1-git-send-email-kwolf@redhat.com> From: Christian Borntraeger Message-ID: <5694AB38.8070202@de.ibm.com> Date: Tue, 12 Jan 2016 08:28:56 +0100 MIME-Version: 1.0 In-Reply-To: <1452537156-7683-1-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] block: Fix .bdrv_open flags List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-block@nongnu.org Cc: den@openvz.org, qemu-devel@nongnu.org, stefanha@redhat.com On 01/11/2016 07:32 PM, Kevin Wolf wrote: > bdrv_common_open() modified bs->open_flags after inferring the set of > options to pass to the driver's .bdrv_open callback. This means that the > cache options were correctly set in bs->open_flags (and therefore > correctly displayed in 'info block'), but the image would actually be > opened with the default cache mode instead. > > This patch removes the flags parameter to bdrv_common_open() (except for > BDRV_O_NO_BACKING it's the same as bs->open_flags anyway, and having two > names for the same thing is confusing), and moves the assignment of > open_flags down to immediately before calling into the block drivers. In > all other places, bs->open_flags is now used consistently. > > Signed-off-by: Kevin Wolf Tested-by: Christian Borntraeger > --- > block.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/block.c b/block.c > index 01655de..ef37d51 100644 > --- a/block.c > +++ b/block.c > @@ -905,7 +905,7 @@ static QemuOptsList bdrv_runtime_opts = { > * Removes all processed options from *options. > */ > static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, > - QDict *options, int flags, Error **errp) > + QDict *options, Error **errp) > { > int ret, open_flags; > const char *filename; > @@ -943,7 +943,8 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, > goto fail_opts; > } > > - trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name); > + trace_bdrv_open_common(bs, filename ?: "", bs->open_flags, > + drv->format_name); > > node_name = qemu_opt_get(opts, "node-name"); > bdrv_assign_node_name(bs, node_name, &local_err); > @@ -955,8 +956,7 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, > > bs->request_alignment = 512; > bs->zero_beyond_eof = true; > - open_flags = bdrv_open_flags(bs, flags); > - bs->read_only = !(open_flags & BDRV_O_RDWR); > + bs->read_only = !(bs->open_flags & BDRV_O_RDWR); > > if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, bs->read_only)) { > error_setg(errp, > @@ -969,7 +969,7 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, > } > > assert(bs->copy_on_read == 0); /* bdrv_new() and bdrv_close() make it so */ > - if (flags & BDRV_O_COPY_ON_READ) { > + if (bs->open_flags & BDRV_O_COPY_ON_READ) { > if (!bs->read_only) { > bdrv_enable_copy_on_read(bs); > } else { > @@ -994,6 +994,7 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, > bdrv_set_enable_write_cache(bs, bs->open_flags & BDRV_O_CACHE_WB); > > /* Open the image, either directly or using a protocol */ > + open_flags = bdrv_open_flags(bs, bs->open_flags); > if (drv->bdrv_file_open) { > assert(file == NULL); > assert(!drv->bdrv_needs_filename || filename != NULL); > @@ -1660,7 +1661,7 @@ static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename, > assert(!(flags & BDRV_O_PROTOCOL) || !file); > > /* Open the image */ > - ret = bdrv_open_common(bs, file, options, flags, &local_err); > + ret = bdrv_open_common(bs, file, options, &local_err); > if (ret < 0) { > goto fail; > } >