c/pve-qemu-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: squash backup dump driver change into patch introducing the driver

Browse Source 
Makes it simpler and shorter. Still results in the same code after
applying both patches in question.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-01-09 15:09:59 +01:00 committed by Thomas Lamprecht
parent 061e9ceb36
commit 862b46e3e0
2 changed files with 28 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch vendored
View File

@ -12,20 +12,20 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
[FE: adapt to coroutine changes] [FE: adapt to coroutine changes]
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
--- ---
block/backup-dump.c | 168 +++++++++++++++++++++++++++++++ block/backup-dump.c | 172 +++++++++++++++++++++++++++++++
block/backup.c | 30 ++---- block/backup.c | 30 ++----
block/meson.build | 1 + block/meson.build | 1 +
include/block/block_int-common.h | 35 +++++++ include/block/block_int-common.h | 35 +++++++
job.c | 3 +- job.c | 3 +-
5 files changed, 214 insertions(+), 23 deletions(-) 5 files changed, 218 insertions(+), 23 deletions(-)
create mode 100644 block/backup-dump.c create mode 100644 block/backup-dump.c
diff --git a/block/backup-dump.c b/block/backup-dump.c diff --git a/block/backup-dump.c b/block/backup-dump.c
new file mode 100644 new file mode 100644
index 0000000000..232a094426 index 0000000000..e46abf1070
--- /dev/null --- /dev/null
+++ b/block/backup-dump.c +++ b/block/backup-dump.c
@@ -0,0 +1,168 @@ @@ -0,0 +1,172 @@
+/* +/*
+ * BlockDriver to send backup data stream to a callback function + * BlockDriver to send backup data stream to a callback function
+ * + *
@ -37,6 +37,8 @@ index 0000000000..232a094426
+ */ + */
+ +
+#include "qemu/osdep.h" +#include "qemu/osdep.h"
+
+#include "qapi/qmp/qdict.h"
+#include "qom/object_interfaces.h" +#include "qom/object_interfaces.h"
+#include "block/block_int.h" +#include "block/block_int.h"
+ +
@ -169,7 +171,7 @@ index 0000000000..232a094426
+block_init(bdrv_backup_dump_init); +block_init(bdrv_backup_dump_init);
+ +
+ +
+BlockDriverState *bdrv_backup_dump_create( +BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
+ int dump_cb_block_size, + int dump_cb_block_size,
+ uint64_t byte_size, + uint64_t byte_size,
+ BackupDumpFunc *dump_cb, + BackupDumpFunc *dump_cb,
@ -177,9 +179,11 @@ index 0000000000..232a094426
+ Error **errp) + Error **errp)
+{ +{
+ BDRVBackupDumpState *state; + BDRVBackupDumpState *state;
+ BlockDriverState *bs = bdrv_new_open_driver(
+ &bdrv_backup_dump_drive, NULL, BDRV_O_RDWR, errp);
+ +
+ QDict *options = qdict_new();
+ qdict_put_str(options, "driver", "backup-dump-drive");
+
+ BlockDriverState *bs = bdrv_co_open(NULL, NULL, options, BDRV_O_RDWR, errp);
+ if (!bs) { + if (!bs) {
+ return NULL; + return NULL;
+ } + }
@ -255,7 +259,7 @@ index 59b71ba9f3..6fde9f7dcd 100644
'blkdebug.c', 'blkdebug.c',
'blklogwrites.c', 'blklogwrites.c',
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index 74195c3004..0f2e1817ad 100644 index 74195c3004..0a0339eee4 100644
--- a/include/block/block_int-common.h --- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h +++ b/include/block/block_int-common.h
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@ -272,7 +276,7 @@ index 74195c3004..0f2e1817ad 100644
+typedef int BackupDumpFunc(void *opaque, uint64_t offset, uint64_t bytes, const void *buf); +typedef int BackupDumpFunc(void *opaque, uint64_t offset, uint64_t bytes, const void *buf);
+ +
+BlockDriverState *bdrv_backup_dump_create( +BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
+ int dump_cb_block_size, + int dump_cb_block_size,
+ uint64_t byte_size, + uint64_t byte_size,
+ BackupDumpFunc *dump_cb, + BackupDumpFunc *dump_cb,

59
debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch vendored
View File

@ -84,63 +84,25 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
create jobs in a drained section] create jobs in a drained section]
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
--- ---
block/backup-dump.c | 10 +-
block/meson.build | 5 + block/meson.build | 5 +
block/monitor/block-hmp-cmds.c | 39 ++ block/monitor/block-hmp-cmds.c | 39 ++
blockdev.c | 1 + blockdev.c | 1 +
hmp-commands-info.hx | 14 + hmp-commands-info.hx | 14 +
hmp-commands.hx | 29 + hmp-commands.hx | 29 +
include/block/block_int-common.h | 2 +-
include/monitor/hmp.h | 3 + include/monitor/hmp.h | 3 +
meson.build | 1 + meson.build | 1 +
monitor/hmp-cmds.c | 72 ++ monitor/hmp-cmds.c | 72 +++
proxmox-backup-client.c | 146 ++++ proxmox-backup-client.c | 146 +++++
proxmox-backup-client.h | 60 ++ proxmox-backup-client.h | 60 ++
pve-backup.c | 1067 ++++++++++++++++++++++++++++++ pve-backup.c | 1067 ++++++++++++++++++++++++++++++++
qapi/block-core.json | 229 +++++++ qapi/block-core.json | 229 +++++++
qapi/common.json | 14 + qapi/common.json | 14 +
qapi/machine.json | 16 +- qapi/machine.json | 16 +-
16 files changed, 1690 insertions(+), 18 deletions(-) 14 files changed, 1682 insertions(+), 14 deletions(-)
create mode 100644 proxmox-backup-client.c create mode 100644 proxmox-backup-client.c
create mode 100644 proxmox-backup-client.h create mode 100644 proxmox-backup-client.h
create mode 100644 pve-backup.c create mode 100644 pve-backup.c
diff --git a/block/backup-dump.c b/block/backup-dump.c
index 232a094426..e46abf1070 100644
--- a/block/backup-dump.c
+++ b/block/backup-dump.c
@@ -9,6 +9,8 @@
*/
#include "qemu/osdep.h"
+
+#include "qapi/qmp/qdict.h"
#include "qom/object_interfaces.h"
#include "block/block_int.h"
@@ -141,7 +143,7 @@ static void bdrv_backup_dump_init(void)
block_init(bdrv_backup_dump_init);
-BlockDriverState *bdrv_backup_dump_create(
+BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
int dump_cb_block_size,
uint64_t byte_size,
BackupDumpFunc *dump_cb,
@@ -149,9 +151,11 @@ BlockDriverState *bdrv_backup_dump_create(
Error **errp)
{
BDRVBackupDumpState *state;
- BlockDriverState *bs = bdrv_new_open_driver(
- &bdrv_backup_dump_drive, NULL, BDRV_O_RDWR, errp);
+ QDict *options = qdict_new();
+ qdict_put_str(options, "driver", "backup-dump-drive");
+
+ BlockDriverState *bs = bdrv_co_open(NULL, NULL, options, BDRV_O_RDWR, errp);
if (!bs) {
return NULL;
}
diff --git a/block/meson.build b/block/meson.build diff --git a/block/meson.build b/block/meson.build
index 6fde9f7dcd..6d468f89e5 100644 index 6fde9f7dcd..6d468f89e5 100644
--- a/block/meson.build --- a/block/meson.build
@ -281,19 +243,6 @@ index e352f86872..0c8b6725fb 100644
ERST ERST
{ {
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index 0f2e1817ad..0a0339eee4 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -63,7 +63,7 @@
typedef int BackupDumpFunc(void *opaque, uint64_t offset, uint64_t bytes, const void *buf);
-BlockDriverState *bdrv_backup_dump_create(
+BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
int dump_cb_block_size,
uint64_t byte_size,
BackupDumpFunc *dump_cb,
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 7a7def7530..cba7afe70c 100644 index 7a7def7530..cba7afe70c 100644
--- a/include/monitor/hmp.h --- a/include/monitor/hmp.h