parallels: Use BB functions in .bdrv_create()
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:
parent
c10c9d9615
commit
8942764f54
@ -30,6 +30,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 "qemu/bitmap.h"
|
#include "qemu/bitmap.h"
|
||||||
#include "qapi/util.h"
|
#include "qapi/util.h"
|
||||||
@ -461,7 +462,7 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp)
|
|||||||
int64_t total_size, cl_size;
|
int64_t total_size, cl_size;
|
||||||
uint8_t tmp[BDRV_SECTOR_SIZE];
|
uint8_t tmp[BDRV_SECTOR_SIZE];
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
BlockDriverState *file;
|
BlockBackend *file;
|
||||||
uint32_t bat_entries, bat_sectors;
|
uint32_t bat_entries, bat_sectors;
|
||||||
ParallelsHeader header;
|
ParallelsHeader header;
|
||||||
int ret;
|
int ret;
|
||||||
@ -477,15 +478,17 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
file = NULL;
|
file = blk_new_open("image", filename, NULL, NULL,
|
||||||
ret = bdrv_open(&file, filename, NULL, NULL,
|
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,
|
||||||
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,
|
&local_err);
|
||||||
&local_err);
|
if (file == NULL) {
|
||||||
if (ret < 0) {
|
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
return ret;
|
return -EIO;
|
||||||
}
|
}
|
||||||
ret = bdrv_truncate(file, 0);
|
|
||||||
|
blk_set_allow_write_beyond_eof(file, true);
|
||||||
|
|
||||||
|
ret = blk_truncate(file, 0);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
@ -509,18 +512,18 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp)
|
|||||||
memset(tmp, 0, sizeof(tmp));
|
memset(tmp, 0, sizeof(tmp));
|
||||||
memcpy(tmp, &header, sizeof(header));
|
memcpy(tmp, &header, sizeof(header));
|
||||||
|
|
||||||
ret = bdrv_pwrite(file, 0, tmp, BDRV_SECTOR_SIZE);
|
ret = blk_pwrite(file, 0, tmp, BDRV_SECTOR_SIZE);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
ret = bdrv_write_zeroes(file, 1, bat_sectors - 1, 0);
|
ret = blk_write_zeroes(file, 1, bat_sectors - 1, 0);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
done:
|
done:
|
||||||
bdrv_unref(file);
|
blk_unref(file);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
|
Loading…
Reference in New Issue
Block a user