]> git.proxmox.com Git - mirror_qemu.git/commit - block.c
block: Fix .bdrv_open flags
authorKevin Wolf <kwolf@redhat.com>
Mon, 11 Jan 2016 18:07:50 +0000 (19:07 +0100)
committerKevin Wolf <kwolf@redhat.com>
Tue, 19 Jan 2016 16:43:55 +0000 (17:43 +0100)
commit82dc8b411040fa8a7418a012ff39b8d06f68e639
tree187c54fb09f1d0c94044cd7381c9d9059dc281b2
parent3db34bf64ab4f8797565dd8750003156c32b301d
block: Fix .bdrv_open flags

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 <kwolf@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
block.c