summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibaut LAURENT <thibaut.laurent@gmail.com>2013-10-25 02:15:07 +0200
committerKevin Wolf <kwolf@redhat.com>2013-10-29 13:06:39 +0100
commit87a5debd3161d24a7d4c685e3c0d8765b5d92a74 (patch)
tree4a0bc68d63a6678a030b1755a8a9a6fa4cbfe299
parent8464b273d69c61e33c55347e5b6bc0659687bae2 (diff)
downloadhqemu-87a5debd3161d24a7d4c685e3c0d8765b5d92a74.zip
hqemu-87a5debd3161d24a7d4c685e3c0d8765b5d92a74.tar.gz
block: Disable BDRV_O_COPY_ON_READ for the backing file
Since commit 0ebd24e0a203cf2852c310b59fbe050190dc6c8c, bdrv_open_common will throw an error when trying to open a file read-only with the BDRV_O_COPY_ON_READ flag set. Although BDRV_O_RDWR is unset for the backing files, BDRV_O_COPY_ON_READ is still passed on if copy-on-read was requested for the drive. Let's unset this flag too before opening the backing file, or bdrv_open_common will fail. Signed-off-by: Thibaut LAURENT <thibaut.laurent@gmail.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/block.c b/block.c
index 366999b..61795fe 100644
--- a/block.c
+++ b/block.c
@@ -999,7 +999,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
}
/* backing files always opened read-only */
- back_flags = bs->open_flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT);
+ back_flags = bs->open_flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT |
+ BDRV_O_COPY_ON_READ);
ret = bdrv_open(bs->backing_hd,
*backing_filename ? backing_filename : NULL, options,
OpenPOWER on IntegriCloud