vmdk: Refactor vmdk_create_extent
The extracted vmdk_init_extent takes a BlockBackend object and initializes the format metadata. It is the common part between "qemu-img create" and "blockdev-create". Add a "BlockBackend *pbb" parameter to vmdk_create_extent, to return the opened BB to the caller in the next patch. Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
9a378495c3
commit
5be28490ca
71
block/vmdk.c
71
block/vmdk.c
|
@ -1741,35 +1741,17 @@ static int coroutine_fn vmdk_co_pwrite_zeroes(BlockDriverState *bs,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vmdk_create_extent(const char *filename, int64_t filesize,
|
static int vmdk_init_extent(BlockBackend *blk,
|
||||||
bool flat, bool compress, bool zeroed_grain,
|
int64_t filesize, bool flat,
|
||||||
QemuOpts *opts, Error **errp)
|
bool compress, bool zeroed_grain,
|
||||||
|
Error **errp)
|
||||||
{
|
{
|
||||||
int ret, i;
|
int ret, i;
|
||||||
BlockBackend *blk = NULL;
|
|
||||||
VMDK4Header header;
|
VMDK4Header header;
|
||||||
Error *local_err = NULL;
|
|
||||||
uint32_t tmp, magic, grains, gd_sectors, gt_size, gt_count;
|
uint32_t tmp, magic, grains, gd_sectors, gt_size, gt_count;
|
||||||
uint32_t *gd_buf = NULL;
|
uint32_t *gd_buf = NULL;
|
||||||
int gd_buf_size;
|
int gd_buf_size;
|
||||||
|
|
||||||
ret = bdrv_create_file(filename, opts, &local_err);
|
|
||||||
if (ret < 0) {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
goto exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
blk = blk_new_open(filename, NULL, NULL,
|
|
||||||
BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL,
|
|
||||||
&local_err);
|
|
||||||
if (blk == NULL) {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
ret = -EIO;
|
|
||||||
goto exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
blk_set_allow_write_beyond_eof(blk, true);
|
|
||||||
|
|
||||||
if (flat) {
|
if (flat) {
|
||||||
ret = blk_truncate(blk, filesize, PREALLOC_MODE_OFF, errp);
|
ret = blk_truncate(blk, filesize, PREALLOC_MODE_OFF, errp);
|
||||||
goto exit;
|
goto exit;
|
||||||
|
@ -1863,18 +1845,53 @@ static int vmdk_create_extent(const char *filename, int64_t filesize,
|
||||||
gd_buf, gd_buf_size, 0);
|
gd_buf, gd_buf_size, 0);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
error_setg(errp, QERR_IO_ERROR);
|
error_setg(errp, QERR_IO_ERROR);
|
||||||
goto exit;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = 0;
|
ret = 0;
|
||||||
exit:
|
exit:
|
||||||
if (blk) {
|
|
||||||
blk_unref(blk);
|
|
||||||
}
|
|
||||||
g_free(gd_buf);
|
g_free(gd_buf);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int vmdk_create_extent(const char *filename, int64_t filesize,
|
||||||
|
bool flat, bool compress, bool zeroed_grain,
|
||||||
|
BlockBackend **pbb,
|
||||||
|
QemuOpts *opts, Error **errp)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
BlockBackend *blk = NULL;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
|
ret = bdrv_create_file(filename, opts, &local_err);
|
||||||
|
if (ret < 0) {
|
||||||
|
error_propagate(errp, local_err);
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
blk = blk_new_open(filename, NULL, NULL,
|
||||||
|
BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL,
|
||||||
|
&local_err);
|
||||||
|
if (blk == NULL) {
|
||||||
|
error_propagate(errp, local_err);
|
||||||
|
ret = -EIO;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
blk_set_allow_write_beyond_eof(blk, true);
|
||||||
|
|
||||||
|
ret = vmdk_init_extent(blk, filesize, flat, compress, zeroed_grain, errp);
|
||||||
|
exit:
|
||||||
|
if (blk) {
|
||||||
|
if (pbb) {
|
||||||
|
*pbb = blk;
|
||||||
|
} else {
|
||||||
|
blk_unref(blk);
|
||||||
|
blk = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int filename_decompose(const char *filename, char *path, char *prefix,
|
static int filename_decompose(const char *filename, char *path, char *prefix,
|
||||||
char *postfix, size_t buf_len, Error **errp)
|
char *postfix, size_t buf_len, Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -2094,7 +2111,7 @@ static int coroutine_fn vmdk_co_create_opts(const char *filename, QemuOpts *opts
|
||||||
snprintf(ext_filename, PATH_MAX, "%s%s", path, desc_filename);
|
snprintf(ext_filename, PATH_MAX, "%s%s", path, desc_filename);
|
||||||
|
|
||||||
if (vmdk_create_extent(ext_filename, size,
|
if (vmdk_create_extent(ext_filename, size,
|
||||||
flat, compress, zeroed_grain, opts, errp)) {
|
flat, compress, zeroed_grain, NULL, opts, errp)) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue