summaryrefslogtreecommitdiff
path: root/block/blkverify.c
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2014-02-18 18:33:12 +0100
committerKevin Wolf <kwolf@redhat.com>2014-02-21 21:02:22 +0100
commitf7d9fd8c7270de25b1e0d0a462b6958b53aa31b2 (patch)
tree5c5105f4f50fcea4c979540cb704e9c3286b607c /block/blkverify.c
parent5acd9d81e1a59e1929aa3a06571f3fda1101c3a2 (diff)
downloadqemu-f7d9fd8c7270de25b1e0d0a462b6958b53aa31b2.tar.gz
qemu-f7d9fd8c7270de25b1e0d0a462b6958b53aa31b2.tar.bz2
qemu-f7d9fd8c7270de25b1e0d0a462b6958b53aa31b2.zip
block: Remove bdrv_open_image()'s force_raw option
This option is now unnecessary since specifying BDRV_O_PROTOCOL as flag will do exactly the same. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/blkverify.c')
-rw-r--r--block/blkverify.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blkverify.c b/block/blkverify.c
index 7d8a32ec79..0e28502e8e 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -137,7 +137,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
/* Open the raw file */
assert(bs->file == NULL);
ret = bdrv_open_image(&bs->file, qemu_opt_get(opts, "x-raw"), options,
- "raw", flags, true, false, &local_err);
+ "raw", flags | BDRV_O_PROTOCOL, false, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto fail;
@@ -146,7 +146,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags,
/* Open the test file */
assert(s->test_file == NULL);
ret = bdrv_open_image(&s->test_file, qemu_opt_get(opts, "x-image"), options,
- "test", flags, false, false, &local_err);
+ "test", flags, false, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
s->test_file = NULL;