vitalif
/
pve-qemu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

{alloc track, pbs} block driver: bdrv_co_preadv: adapt return values 

to be in-line with what other implementations in QEMU do. Commit
1d39c7098bbfa6862cb96066c4f8f6735ea397c5 mentions the EIO bit and
the function is expected to return 0 upon success (see other
implementations).

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
master
Fiona Ebner 2022-10-14 14:07:16 +02:00 committed by Wolfgang Bumiller
parent a262e9642b
commit 4e1935c2c9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch vendored
View File

@ -7,8 +7,9 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
[error cleanups, file_open implementation] [error cleanups, file_open implementation]
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com> Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
[adapt to changed function signatures] [FE: adapt to changed function signatures
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com> make pbs_co_preadv return values consistent with QEMU]
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
--- ---
block/meson.build | 3 + block/meson.build | 3 +
block/pbs.c | 276 +++++++++++++++++++++++++++++++++++++++++++ block/pbs.c | 276 +++++++++++++++++++++++++++++++++++++++++++
@ -34,7 +35,7 @@ index 2783b77e9c..a26a69434e 100644
diff --git a/block/pbs.c b/block/pbs.c diff --git a/block/pbs.c b/block/pbs.c
new file mode 100644 new file mode 100644
index 0000000000..0b05ea9080 index 0000000000..9d1f1f39d4
--- /dev/null --- /dev/null
+++ b/block/pbs.c +++ b/block/pbs.c
@@ -0,0 +1,276 @@ @@ -0,0 +1,276 @@
@ -244,7 +245,7 @@ index 0000000000..0b05ea9080
+ +
+ if (offset < 0 || bytes < 0) { + if (offset < 0 || bytes < 0) {
+ fprintf(stderr, "unexpected negative 'offset' or 'bytes' value!\n"); + fprintf(stderr, "unexpected negative 'offset' or 'bytes' value!\n");
+ return -EINVAL; + return -EIO;
+ } + }
+ +
+ ReadCallbackData rcb = { + ReadCallbackData rcb = {
@ -266,7 +267,7 @@ index 0000000000..0b05ea9080
+ qemu_iovec_from_buf(qiov, 0, buf, bytes); + qemu_iovec_from_buf(qiov, 0, buf, bytes);
+ free(buf); + free(buf);
+ +
+ return ret; + return 0;
+} +}
+ +
+static coroutine_fn int pbs_co_pwritev(BlockDriverState *bs, +static coroutine_fn int pbs_co_pwritev(BlockDriverState *bs,

2
debian/patches/pve/0045-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch vendored
View File

@ -49,5 +49,5 @@ index 0b05ea9080..c5eb4d5bad 100644
+ g_free(buf); + g_free(buf);
+ } + }
return ret; return 0;
} }

9
debian/patches/pve/0048-block-add-alloc-track-driver.patch vendored
View File

@ -24,8 +24,9 @@ once the backing image is removed. It will be replaced by 'file'.
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
[adapt to changed function signatures] [FE: adapt to changed function signatures
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com> make error return value consistent with QEMU]
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
--- ---
block/alloc-track.c | 350 ++++++++++++++++++++++++++++++++++++++++++++ block/alloc-track.c | 350 ++++++++++++++++++++++++++++++++++++++++++++
block/meson.build | 1 + block/meson.build | 1 +
@ -34,7 +35,7 @@ Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
diff --git a/block/alloc-track.c b/block/alloc-track.c diff --git a/block/alloc-track.c b/block/alloc-track.c
new file mode 100644 new file mode 100644
index 0000000000..6b50fbe537 index 0000000000..43d40d11af
--- /dev/null --- /dev/null
+++ b/block/alloc-track.c +++ b/block/alloc-track.c
@@ -0,0 +1,350 @@ @@ -0,0 +1,350 @@
@ -181,7 +182,7 @@ index 0000000000..6b50fbe537
+ +
+ if (offset < 0 || bytes < 0) { + if (offset < 0 || bytes < 0) {
+ fprintf(stderr, "unexpected negative 'offset' or 'bytes' value!\n"); + fprintf(stderr, "unexpected negative 'offset' or 'bytes' value!\n");
+ return -EINVAL; + return -EIO;
+ } + }
+ +
+ /* a read request can span multiple granularity-sized chunks, and can thus + /* a read request can span multiple granularity-sized chunks, and can thus