1 From a004ee9295029201e8fc3b8fe4acf7f85674527c Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Fri, 9 Sep 2016 14:51:28 +0200
4 Subject: [PATCH 38/48] vma: byte based write calls
7 vma-reader.c | 42 +++++++++++++++++++++---------------------
8 vma.c | 22 ++++++++++------------
10 3 files changed, 32 insertions(+), 34 deletions(-)
12 diff --git a/vma-reader.c b/vma-reader.c
13 index 78f1de9..2000889 100644
17 static unsigned char zero_vma_block[VMA_BLOCK_SIZE];
19 typedef struct VmaRestoreState {
20 - BlockDriverState *bs;
21 + BlockBackend *target;
23 unsigned long *bitmap;
25 @@ -423,12 +423,12 @@ VmaDeviceInfo *vma_reader_get_device_info(VmaReader *vmar, guint8 dev_id)
28 static void allocate_rstate(VmaReader *vmar, guint8 dev_id,
29 - BlockDriverState *bs, bool write_zeroes)
30 + BlockBackend *target, bool write_zeroes)
35 - vmar->rstate[dev_id].bs = bs;
36 + vmar->rstate[dev_id].target = target;
37 vmar->rstate[dev_id].write_zeroes = write_zeroes;
39 int64_t size = vmar->devinfo[dev_id].size;
40 @@ -443,15 +443,15 @@ static void allocate_rstate(VmaReader *vmar, guint8 dev_id,
41 vmar->cluster_count += size/VMA_CLUSTER_SIZE;
44 -int vma_reader_register_bs(VmaReader *vmar, guint8 dev_id, BlockDriverState *bs,
45 +int vma_reader_register_bs(VmaReader *vmar, guint8 dev_id, BlockBackend *target,
46 bool write_zeroes, Error **errp)
50 + assert(target != NULL);
52 - assert(vmar->rstate[dev_id].bs == NULL);
53 + assert(vmar->rstate[dev_id].target == NULL);
55 - int64_t size = bdrv_getlength(bs);
56 + int64_t size = blk_getlength(target);
57 int64_t size_diff = size - vmar->devinfo[dev_id].size;
59 /* storage types can have different size restrictions, so it
60 @@ -465,7 +465,7 @@ int vma_reader_register_bs(VmaReader *vmar, guint8 dev_id, BlockDriverState *bs,
64 - allocate_rstate(vmar, dev_id, bs, write_zeroes);
65 + allocate_rstate(vmar, dev_id, target, write_zeroes);
69 @@ -507,7 +507,7 @@ static size_t full_write(int fd, void *buf, size_t len)
72 static int restore_write_data(VmaReader *vmar, guint8 dev_id,
73 - BlockDriverState *bs, int vmstate_fd,
74 + BlockBackend *target, int vmstate_fd,
75 unsigned char *buf, int64_t sector_num,
76 int nb_sectors, Error **errp)
78 @@ -523,10 +523,10 @@ static int restore_write_data(VmaReader *vmar, guint8 dev_id,
82 - int res = bdrv_write(bs, sector_num, buf, nb_sectors);
83 + int res = blk_pwrite(target, sector_num * BDRV_SECTOR_SIZE, buf, nb_sectors * BDRV_SECTOR_SIZE, 0);
85 - error_setg(errp, "bdrv_write to %s failed (%d)",
86 - bdrv_get_device_name(bs), res);
87 + error_setg(errp, "blk_pwrite to %s failed (%d)",
88 + bdrv_get_device_name(blk_bs(target)), res);
92 @@ -556,11 +556,11 @@ static int restore_extent(VmaReader *vmar, unsigned char *buf,
95 VmaRestoreState *rstate = &vmar->rstate[dev_id];
96 - BlockDriverState *bs = NULL;
97 + BlockBackend *target = NULL;
99 if (dev_id != vmar->vmstate_stream) {
101 - if (!verify && !bs) {
102 + target = rstate->target;
103 + if (!verify && !target) {
104 error_setg(errp, "got wrong dev id %d", dev_id);
107 @@ -618,7 +618,7 @@ static int restore_extent(VmaReader *vmar, unsigned char *buf,
110 int nb_sectors = end_sector - sector_num;
111 - if (restore_write_data(vmar, dev_id, bs, vmstate_fd,
112 + if (restore_write_data(vmar, dev_id, target, vmstate_fd,
113 buf + start, sector_num, nb_sectors,
116 @@ -654,7 +654,7 @@ static int restore_extent(VmaReader *vmar, unsigned char *buf,
119 int nb_sectors = end_sector - sector_num;
120 - if (restore_write_data(vmar, dev_id, bs, vmstate_fd,
121 + if (restore_write_data(vmar, dev_id, target, vmstate_fd,
122 buf + start, sector_num,
123 nb_sectors, errp) < 0) {
125 @@ -678,7 +678,7 @@ static int restore_extent(VmaReader *vmar, unsigned char *buf,
128 if (rstate->write_zeroes && !verify) {
129 - if (restore_write_data(vmar, dev_id, bs, vmstate_fd,
130 + if (restore_write_data(vmar, dev_id, target, vmstate_fd,
131 zero_vma_block, sector_num,
132 nb_sectors, errp) < 0) {
134 @@ -786,12 +786,12 @@ static int vma_reader_restore_full(VmaReader *vmar, int vmstate_fd,
136 for (i = 1; i < 256; i++) {
137 VmaRestoreState *rstate = &vmar->rstate[i];
139 + if (!rstate->target) {
143 - if (bdrv_flush(rstate->bs) < 0) {
144 - error_setg(errp, "vma bdrv_flush %s failed",
145 + if (blk_flush(rstate->target) < 0) {
146 + error_setg(errp, "vma blk_flush %s failed",
147 vmar->devinfo[i].devname);
150 diff --git a/vma.c b/vma.c
151 index ad51090..aafdc2d 100644
154 @@ -334,9 +334,7 @@ static int extract_content(int argc, char **argv)
155 error_get_pretty(errp));
158 - BlockDriverState *bs = blk_bs(blk);
160 - if (vma_reader_register_bs(vmar, i, bs, write_zero, &errp) < 0) {
161 + if (vma_reader_register_bs(vmar, i, blk, write_zero, &errp) < 0) {
162 g_error("%s", error_get_pretty(errp));
165 @@ -428,7 +426,7 @@ static int verify_content(int argc, char **argv)
168 typedef struct BackupJob {
169 - BlockDriverState *bs;
170 + BlockBackend *target;
174 @@ -457,7 +455,7 @@ static void coroutine_fn backup_run(void *opaque)
178 - unsigned char *buf = qemu_blockalign(job->bs, VMA_CLUSTER_SIZE);
179 + unsigned char *buf = blk_blockalign(job->target, VMA_CLUSTER_SIZE);
182 end = DIV_ROUND_UP(job->len / BDRV_SECTOR_SIZE,
183 @@ -468,8 +466,8 @@ static void coroutine_fn backup_run(void *opaque)
184 iov.iov_len = VMA_CLUSTER_SIZE;
185 qemu_iovec_init_external(&qiov, &iov, 1);
187 - ret = bdrv_co_readv(job->bs, start * BACKUP_SECTORS_PER_CLUSTER,
188 - BACKUP_SECTORS_PER_CLUSTER, &qiov);
189 + ret = blk_co_preadv(job->target, start * BACKUP_SECTORS_PER_CLUSTER,
190 + BACKUP_SECTORS_PER_CLUSTER, &qiov, 0);
192 vma_writer_set_error(job->vmaw, "read error", -1);
194 @@ -564,14 +562,14 @@ static int create_archive(int argc, char **argv)
195 path = extract_devname(path, &devname, devcount++);
198 - BlockDriverState *bs;
199 + BlockBackend *target;
201 - bs = bdrv_open(path, NULL, NULL, 0, &errp);
203 + target = blk_new_open(path, NULL, NULL, 0, &errp);
206 g_error("bdrv_open '%s' failed - %s", path, error_get_pretty(errp));
208 - int64_t size = bdrv_getlength(bs);
209 + int64_t size = blk_getlength(target);
210 int dev_id = vma_writer_register_stream(vmaw, devname, size);
213 @@ -580,7 +578,7 @@ static int create_archive(int argc, char **argv)
215 BackupJob *job = g_new0(BackupJob, 1);
218 + job->target = target;
220 job->dev_id = dev_id;
222 diff --git a/vma.h b/vma.h
223 index 365ceb2..fa6f4df 100644
226 @@ -140,7 +140,7 @@ VmaHeader *vma_reader_get_header(VmaReader *vmar);
227 GList *vma_reader_get_config_data(VmaReader *vmar);
228 VmaDeviceInfo *vma_reader_get_device_info(VmaReader *vmar, guint8 dev_id);
229 int vma_reader_register_bs(VmaReader *vmar, guint8 dev_id,
230 - BlockDriverState *bs, bool write_zeroes,
231 + BlockBackend *target, bool write_zeroes,
233 int vma_reader_restore(VmaReader *vmar, int vmstate_fd, bool verbose,