diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-02-18 18:33:05 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-02-21 21:02:21 +0100 |
| commit | f67503e5bd8997ea7ec3f4bfa0af0e06321771a6 (patch) | |
| tree | 1b564ea3c13e76166a7e866995eb9c7f4055ae5c /block/blkverify.c | |
| parent | e6dc8a1f83835054fcaf1dcb41af7c868688c068 (diff) | |
| download | qemu-f67503e5bd8997ea7ec3f4bfa0af0e06321771a6.zip qemu-f67503e5bd8997ea7ec3f4bfa0af0e06321771a6.tar.gz qemu-f67503e5bd8997ea7ec3f4bfa0af0e06321771a6.tar.bz2 | |
block: Change BDS parameter of bdrv_open() to **
Make bdrv_open() take a pointer to a BDS pointer, similarly to
bdrv_file_open(). If a pointer to a NULL pointer is given, bdrv_open()
will create a new BDS with an empty name; if the BDS pointer is not
NULL, that existing BDS will be reused (in the same way as bdrv_open()
already did).
Signed-off-by: Max Reitz <mreitz@redhat.com>
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blkverify.c b/block/blkverify.c index 1563c88..7d8a32e 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -135,6 +135,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); if (ret < 0) { @@ -143,6 +144,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); if (ret < 0) { |