diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-02-18 18:33:07 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-02-21 21:02:22 +0100 |
| commit | 2e40134bfdbb073512f9f264cb96162787ec62b1 (patch) | |
| tree | 53cb53980ac38e9ee6d58e49850864ffc62a3f3a /block/qed.c | |
| parent | ddf5636dc9e4be894f2ab4a5f803d915478b5099 (diff) | |
| download | qemu-2e40134bfdbb073512f9f264cb96162787ec62b1.zip qemu-2e40134bfdbb073512f9f264cb96162787ec62b1.tar.gz qemu-2e40134bfdbb073512f9f264cb96162787ec62b1.tar.bz2 | |
block: Make bdrv_file_open() static
Add the bdrv_open() option BDRV_O_PROTOCOL which results in passing the
call to bdrv_file_open(). Additionally, make bdrv_file_open() static and
therefore bdrv_open() the only way to call it.
Consequently, all existing calls to bdrv_file_open() have to be adjusted
to use bdrv_open() with the BDRV_O_PROTOCOL flag instead.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qed.c')
| -rw-r--r-- | block/qed.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/qed.c b/block/qed.c index b9ca7ac..9bc181f 100644 --- a/block/qed.c +++ b/block/qed.c @@ -562,7 +562,7 @@ static int qed_create(const char *filename, uint32_t cluster_size, size_t l1_size = header.cluster_size * header.table_size; Error *local_err = NULL; int ret = 0; - BlockDriverState *bs = NULL; + BlockDriverState *bs; ret = bdrv_create_file(filename, NULL, &local_err); if (ret < 0) { @@ -571,8 +571,10 @@ static int qed_create(const char *filename, uint32_t cluster_size, return ret; } - ret = bdrv_file_open(&bs, filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_CACHE_WB, &local_err); + bs = NULL; + ret = bdrv_open(&bs, filename, NULL, NULL, + BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, NULL, + &local_err); if (ret < 0) { qerror_report_err(local_err); error_free(local_err); |