diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2010-03-31 14:40:27 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-04-23 16:08:46 +0200 |
| commit | d6e9098e10e82feeddb824d7c3d0cf61aff96c29 (patch) | |
| tree | 29a16b6152876e8ea74703052c94675bfdeb51ea /block | |
| parent | 4768fa902c3860f2fe34403e6e1c83bfca6da034 (diff) | |
Replace calls of old bdrv_open
What is known today as bdrv_open2 becomes the new bdrv_open. All remaining
callers of the old function are converted to the new one. In some places they
even know the right format, so they should have used bdrv_open2 from the
beginning.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 4 | ||||
| -rw-r--r-- | block/vmdk.c | 2 | ||||
| -rw-r--r-- | block/vvfat.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 67affa6396..30ded6ae9b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -52,7 +52,7 @@ typedef struct { #define QCOW_EXT_MAGIC_END 0 #define QCOW_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA - +static BlockDriver bdrv_qcow2; static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename) { @@ -1033,7 +1033,7 @@ exit: if (ret == 0 && prealloc) { BlockDriverState *bs; bs = bdrv_new(""); - bdrv_open(bs, filename, BDRV_O_CACHE_WB | BDRV_O_RDWR); + bdrv_open(bs, filename, BDRV_O_CACHE_WB | BDRV_O_RDWR, &bdrv_qcow2); preallocate(bs); bdrv_close(bs); } diff --git a/block/vmdk.c b/block/vmdk.c index 007fca4c70..6fdea1d305 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -390,7 +390,7 @@ static int vmdk_parent_open(BlockDriverState *bs, const char * filename) return -1; } parent_open = 1; - if (bdrv_open(bs->backing_hd, parent_img_name, 0) < 0) + if (bdrv_open(bs->backing_hd, parent_img_name, 0, NULL) < 0) goto failure; parent_open = 0; } diff --git a/block/vvfat.c b/block/vvfat.c index 36f6ab4441..0701df49f4 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2795,8 +2795,11 @@ static int enable_write_target(BDRVVVFATState *s) if (bdrv_create(bdrv_qcow, s->qcow_filename, options) < 0) return -1; s->qcow = bdrv_new(""); - if (s->qcow == NULL || bdrv_open(s->qcow, s->qcow_filename, BDRV_O_RDWR) < 0) + if (s->qcow == NULL || + bdrv_open(s->qcow, s->qcow_filename, BDRV_O_RDWR, bdrv_qcow) < 0) + { return -1; + } #ifndef _WIN32 unlink(s->qcow_filename); |