@@ -29,13 +29,17 @@
#include "block/block_int.h"
#include "qemu/option.h"
-static QEMUOptionParameter raw_create_options[] = {
- {
- .name = BLOCK_OPT_SIZE,
- .type = OPT_SIZE,
- .help = "Virtual disk size"
+static QemuOptsList raw_create_options = {
+ .name = "raw_create_options",
+ .head = QTAILQ_HEAD_INITIALIZER(raw_create_options.head),
+ .desc = {
+ {
+ .name = BLOCK_OPT_SIZE,
+ .type = QEMU_OPT_SIZE,
+ .help = "Virtual disk size"
+ },
+ { 0 }
},
- { 0 }
};
static int raw_reopen_prepare(BDRVReopenState *reopen_state,
@@ -139,8 +143,7 @@ static int raw_has_zero_init(BlockDriverState *bs)
return bdrv_has_zero_init(bs->file);
}
-static int raw_create(const char *filename, QEMUOptionParameter *options,
- Error **errp)
+static int raw_create(const char *filename, QemuOpts *options, Error **errp)
{
Error *local_err = NULL;
int ret;
@@ -194,7 +197,7 @@ static BlockDriver bdrv_raw = {
.bdrv_lock_medium = &raw_lock_medium,
.bdrv_ioctl = &raw_ioctl,
.bdrv_aio_ioctl = &raw_aio_ioctl,
- .create_options = &raw_create_options[0],
+ .create_options = &raw_create_options,
.bdrv_has_zero_init = &raw_has_zero_init
};
Do the directly migration from QemuOptionParameter to QemuOpts on raw_bsd block driver. Signed-off-by: Leandro Dorileo <l@dorileo.org> --- block/raw_bsd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)