david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vdi: Use BB functions in .bdrv_create()

Browse Source 
All users of the block layers are supposed to go through a BlockBackend.
The .bdrv_create() implementation is one such user, so this patch
converts it.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2016-03-08 15:57:05 +01:00
parent fba98d455a
commit a08f0c3b5f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
block/vdi.c
View File

@ -52,6 +52,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "block/block_int.h" #include "block/block_int.h"
#include "sysemu/block-backend.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "qemu/coroutine.h" #include "qemu/coroutine.h"
@ -733,7 +734,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
size_t bmap_size; size_t bmap_size;
int64_t offset = 0; int64_t offset = 0;
Error *local_err = NULL; Error *local_err = NULL;
BlockDriverState *bs = NULL; BlockBackend *blk = NULL;
uint32_t *bmap = NULL; uint32_t *bmap = NULL;
logout("\n"); logout("\n");
@ -766,14 +767,18 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto exit; goto exit;
} }
ret = bdrv_open(&bs, filename, NULL, NULL,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, blk = blk_new_open("image", filename, NULL, NULL,
&local_err); BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,
if (ret < 0) { &local_err);
if (blk == NULL) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
ret = -EIO;
goto exit; goto exit;
} }
blk_set_allow_write_beyond_eof(blk, true);
/* We need enough blocks to store the given disk size, /* We need enough blocks to store the given disk size,
so always round up. */ so always round up. */
blocks = DIV_ROUND_UP(bytes, block_size); blocks = DIV_ROUND_UP(bytes, block_size);
@ -803,7 +808,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
vdi_header_print(&header); vdi_header_print(&header);
#endif #endif
vdi_header_to_le(&header); vdi_header_to_le(&header);
ret = bdrv_pwrite_sync(bs, offset, &header, sizeof(header)); ret = blk_pwrite(blk, offset, &header, sizeof(header));
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Error writing header to %s", filename); error_setg(errp, "Error writing header to %s", filename);
goto exit; goto exit;
@ -824,7 +829,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
bmap[i] = VDI_UNALLOCATED; bmap[i] = VDI_UNALLOCATED;
} }
} }
ret = bdrv_pwrite_sync(bs, offset, bmap, bmap_size); ret = blk_pwrite(blk, offset, bmap, bmap_size);
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Error writing bmap to %s", filename); error_setg(errp, "Error writing bmap to %s", filename);
goto exit; goto exit;
@ -833,7 +838,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
} }
if (image_type == VDI_TYPE_STATIC) { if (image_type == VDI_TYPE_STATIC) {
ret = bdrv_truncate(bs, offset + blocks * block_size); ret = blk_truncate(blk, offset + blocks * block_size);
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Failed to statically allocate %s", filename); error_setg(errp, "Failed to statically allocate %s", filename);
goto exit; goto exit;
@ -841,7 +846,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
} }
exit: exit:
bdrv_unref(bs); blk_unref(blk);
g_free(bmap); g_free(bmap);
return ret; return ret;
} }