[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/11] parallels: Use BB functions in .bdrv_create()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 03/11] parallels: Use BB functions in .bdrv_create() |
Date: |
Tue, 8 Mar 2016 17:34:24 +0100 |
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 <address@hidden>
---
block/parallels.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 3f9fd48..0d1a60c 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -30,6 +30,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "block/block_int.h"
+#include "sysemu/block-backend.h"
#include "qemu/module.h"
#include "qemu/bitmap.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;
uint8_t tmp[BDRV_SECTOR_SIZE];
Error *local_err = NULL;
- BlockDriverState *file;
+ BlockBackend *file;
uint32_t bat_entries, bat_sectors;
ParallelsHeader header;
int ret;
@@ -477,15 +478,17 @@ static int parallels_create(const char *filename,
QemuOpts *opts, Error **errp)
return ret;
}
- file = NULL;
- ret = bdrv_open(&file, filename, NULL, NULL,
- BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,
- &local_err);
- if (ret < 0) {
+ file = blk_new_open("image", filename, NULL, NULL,
+ BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL,
+ &local_err);
+ if (file == NULL) {
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) {
goto exit;
}
@@ -509,18 +512,18 @@ static int parallels_create(const char *filename,
QemuOpts *opts, Error **errp)
memset(tmp, 0, sizeof(tmp));
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) {
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) {
goto exit;
}
ret = 0;
done:
- bdrv_unref(file);
+ blk_unref(file);
return ret;
exit:
--
1.8.3.1
- [Qemu-devel] [PATCH 00/11] block: Use BB function in .bdrv_create() implementations, Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 05/11] qcow2: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 04/11] qcow: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 02/11] block: Introduce blk_set_allow_write_beyond_eof(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 07/11] sheepdog: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 03/11] parallels: Use BB functions in .bdrv_create(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 08/11] vdi: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 09/11] vhdx: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 06/11] qed: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 01/11] block: Use writeback in .bdrv_create() implementations, Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 11/11] vpc: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- [Qemu-devel] [PATCH 10/11] vmdk: Use BB functions in .bdrv_create(), Kevin Wolf, 2016/03/08
- Re: [Qemu-devel] [PATCH 00/11] block: Use BB function in .bdrv_create() implementations, Kevin Wolf, 2016/03/14