From 91a073a975b220447eb64263690f49a5494347cb Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 27 May 2009 14:48:06 +0200 Subject: Drop bdrv_create2 This patch converts the remaining users of bdrv_create2 to bdrv_create and removes the now unused function. Signed-off-by: Kevin Wolf Signed-off-by: Anthony Liguori --- block/vvfat.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'block') diff --git a/block/vvfat.c b/block/vvfat.c index 13960e9..6c29f48 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2770,6 +2770,8 @@ static BlockDriver vvfat_write_target = { static int enable_write_target(BDRVVVFATState *s) { + BlockDriver *bdrv_qcow; + QEMUOptionParameter *options; int size = sector2cluster(s, s->sector_count); s->used_clusters = calloc(size, 1); @@ -2777,8 +2779,13 @@ static int enable_write_target(BDRVVVFATState *s) s->qcow_filename = qemu_malloc(1024); get_tmp_filename(s->qcow_filename, 1024); - if (bdrv_create2(bdrv_find_format("qcow"), - s->qcow_filename, s->sector_count, "fat:", NULL, 0) < 0) + + bdrv_qcow = bdrv_find_format("qcow"); + options = parse_option_parameters("", bdrv_qcow->create_options, NULL); + set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512); + set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:"); + + 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, 0) < 0) -- cgit v1.1