Proxmox/pve-qemu
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-qemu.git synced 2025-01-31 05:47:36 +03:00
Code

refresh patches

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2024-11-12 16:42:30 +01:00
parent 4bc8223ac9
commit d14bffa8c0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/pve/0044-copy-before-write-allow-specifying-minimum-cluster-s.patch vendored
View File

@ -82,10 +82,10 @@ index cc618e4561..12d662e9d4 100644
return NULL; return NULL;
} }
diff --git a/block/copy-before-write.c b/block/copy-before-write.c diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 853e01a1eb..47b3cdd09f 100644 index 28f6a096cd..ef4e666303 100644
--- a/block/copy-before-write.c --- a/block/copy-before-write.c
+++ b/block/copy-before-write.c +++ b/block/copy-before-write.c
@@ -477,7 +477,8 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags, @@ -478,7 +478,8 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
s->discard_source = flags & BDRV_O_CBW_DISCARD_SOURCE; s->discard_source = flags & BDRV_O_CBW_DISCARD_SOURCE;
s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap,

6
debian/patches/pve/0045-backup-add-minimum-cluster-size-to-performance-optio.patch vendored
View File

@ -36,10 +36,10 @@ index 1963e47ab9..fe69723ada 100644
goto error; goto error;
} }
diff --git a/block/copy-before-write.c b/block/copy-before-write.c diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 47b3cdd09f..bba58326d7 100644 index ef4e666303..adb27649a8 100644
--- a/block/copy-before-write.c --- a/block/copy-before-write.c
+++ b/block/copy-before-write.c +++ b/block/copy-before-write.c
@@ -546,6 +546,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, @@ -547,6 +547,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
BlockDriverState *target, BlockDriverState *target,
const char *filter_node_name, const char *filter_node_name,
bool discard_source, bool discard_source,
@ -47,7 +47,7 @@ index 47b3cdd09f..bba58326d7 100644
BlockCopyState **bcs, BlockCopyState **bcs,
Error **errp) Error **errp)
{ {
@@ -564,6 +565,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, @@ -565,6 +566,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
} }
qdict_put_str(opts, "file", bdrv_get_node_name(source)); qdict_put_str(opts, "file", bdrv_get_node_name(source));
qdict_put_str(opts, "target", bdrv_get_node_name(target)); qdict_put_str(opts, "target", bdrv_get_node_name(target));

12
debian/patches/pve/0047-PVE-backup-improve-error-when-copy-before-write-fail.patch vendored
View File

@ -21,7 +21,7 @@ Tested-by: Friedrich Weber <f.weber@proxmox.com>
3 files changed, 22 insertions(+), 6 deletions(-) 3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/block/copy-before-write.c b/block/copy-before-write.c diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index bba58326d7..50cc4c7aae 100644 index adb27649a8..a5bb4d14f6 100644
--- a/block/copy-before-write.c --- a/block/copy-before-write.c
+++ b/block/copy-before-write.c +++ b/block/copy-before-write.c
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
@ -32,7 +32,7 @@ index bba58326d7..50cc4c7aae 100644
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "block/block_int.h" #include "block/block_int.h"
@@ -74,7 +75,8 @@ typedef struct BDRVCopyBeforeWriteState { @@ -75,7 +76,8 @@ typedef struct BDRVCopyBeforeWriteState {
* @snapshot_error is normally zero. But on first copy-before-write failure * @snapshot_error is normally zero. But on first copy-before-write failure
* when @on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT, @snapshot_error takes * when @on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT, @snapshot_error takes
* value of this error (<0). After that all in-flight and further * value of this error (<0). After that all in-flight and further
@ -42,7 +42,7 @@ index bba58326d7..50cc4c7aae 100644
*/ */
int snapshot_error; int snapshot_error;
} BDRVCopyBeforeWriteState; } BDRVCopyBeforeWriteState;
@@ -114,7 +116,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs, @@ -115,7 +117,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
return 0; return 0;
} }
@ -51,7 +51,7 @@ index bba58326d7..50cc4c7aae 100644
return 0; return 0;
} }
@@ -138,9 +140,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs, @@ -139,9 +141,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
WITH_QEMU_LOCK_GUARD(&s->lock) { WITH_QEMU_LOCK_GUARD(&s->lock) {
if (ret < 0) { if (ret < 0) {
assert(s->on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT); assert(s->on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT);
@ -62,7 +62,7 @@ index bba58326d7..50cc4c7aae 100644
} else { } else {
bdrv_set_dirty_bitmap(s->done_bitmap, off, end - off); bdrv_set_dirty_bitmap(s->done_bitmap, off, end - off);
} }
@@ -214,7 +214,7 @@ cbw_snapshot_read_lock(BlockDriverState *bs, int64_t offset, int64_t bytes, @@ -215,7 +215,7 @@ cbw_snapshot_read_lock(BlockDriverState *bs, int64_t offset, int64_t bytes,
QEMU_LOCK_GUARD(&s->lock); QEMU_LOCK_GUARD(&s->lock);
@ -71,7 +71,7 @@ index bba58326d7..50cc4c7aae 100644
g_free(req); g_free(req);
return NULL; return NULL;
} }
@@ -585,6 +585,12 @@ void bdrv_cbw_drop(BlockDriverState *bs) @@ -586,6 +586,12 @@ void bdrv_cbw_drop(BlockDriverState *bs)
bdrv_unref(bs); bdrv_unref(bs);
} }