diff options
| author | Chunyan Liu <cyliu@suse.com> | 2014-06-05 17:20:51 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-16 17:23:20 +0800 |
| commit | 83d0521a1e35989b0cb7235aef48455fedda3ca4 (patch) | |
| tree | b500cdb1603182b7249a781712a1f058820d5b1b /include/block/block.h | |
| parent | 4782183da39ec988b8290bbc0289c9f50ba33ea4 (diff) | |
| download | qemu-83d0521a1e35989b0cb7235aef48455fedda3ca4.tar.gz qemu-83d0521a1e35989b0cb7235aef48455fedda3ca4.tar.bz2 qemu-83d0521a1e35989b0cb7235aef48455fedda3ca4.zip | |
change block layer to support both QemuOpts and QEMUOptionParamter
Change block layer to support both QemuOpts and QEMUOptionParameter.
After this patch, it will change backend drivers one by one. At the end,
QEMUOptionParameter will be removed and only QemuOpts is kept.
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/block/block.h')
| -rw-r--r-- | include/block/block.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/block/block.h b/include/block/block.h index 7d86e29cf4..4312b8176e 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -204,9 +204,9 @@ BlockDriver *bdrv_find_format(const char *format_name); BlockDriver *bdrv_find_whitelisted_format(const char *format_name, bool readonly); int bdrv_create(BlockDriver *drv, const char* filename, - QEMUOptionParameter *options, Error **errp); + QEMUOptionParameter *options, QemuOpts *opts, Error **errp); int bdrv_create_file(const char* filename, QEMUOptionParameter *options, - Error **errp); + QemuOpts *opts, Error **errp); BlockDriverState *bdrv_new(const char *device_name, Error **errp); void bdrv_make_anon(BlockDriverState *bs); void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old); @@ -312,7 +312,8 @@ typedef enum { int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix); -int bdrv_amend_options(BlockDriverState *bs_new, QEMUOptionParameter *options); +int bdrv_amend_options(BlockDriverState *bs_new, QEMUOptionParameter *options, + QemuOpts *opts); /* external snapshots */ bool bdrv_recurse_is_first_non_filter(BlockDriverState *bs, |