* [pve-devel] applied: [PATCH qemu] PVE backup: remove unused targetfile member from device info
@ 2024-06-14 13:28 Fiona Ebner
0 siblings, 0 replies; only message in thread
From: Fiona Ebner @ 2024-06-14 13:28 UTC (permalink / raw)
To: pve-devel
This became unused after 9e0186f ("backup: drop broken
BACKUP_FORMAT_DIR").
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
...ackup-Proxmox-backup-patches-for-QEMU.patch | 12 ++++--------
...Migrate-dirty-bitmap-state-via-savevm.patch | 4 ++--
.../0050-PVE-backup-add-fleecing-option.patch | 18 +++++++++---------
...ove-error-when-copy-before-write-fail.patch | 4 ++--
4 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
index c3b843b..af4565f 100644
--- a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
+++ b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
@@ -94,11 +94,11 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
monitor/hmp-cmds.c | 72 +++
proxmox-backup-client.c | 146 +++++
proxmox-backup-client.h | 60 ++
- pve-backup.c | 1096 ++++++++++++++++++++++++++++++++
+ pve-backup.c | 1092 ++++++++++++++++++++++++++++++++
qapi/block-core.json | 233 +++++++
qapi/common.json | 14 +
qapi/machine.json | 16 +-
- 14 files changed, 1715 insertions(+), 14 deletions(-)
+ 14 files changed, 1711 insertions(+), 14 deletions(-)
create mode 100644 proxmox-backup-client.c
create mode 100644 proxmox-backup-client.h
create mode 100644 pve-backup.c
@@ -586,10 +586,10 @@ index 0000000000..8cbf645b2c
+#endif /* PROXMOX_BACKUP_CLIENT_H */
diff --git a/pve-backup.c b/pve-backup.c
new file mode 100644
-index 0000000000..ef1738af52
+index 0000000000..c755bf302b
--- /dev/null
+++ b/pve-backup.c
-@@ -0,0 +1,1096 @@
+@@ -0,0 +1,1092 @@
+#include "proxmox-backup-client.h"
+#include "vma.h"
+
@@ -678,7 +678,6 @@ index 0000000000..ef1738af52
+ uint64_t block_size;
+ uint8_t dev_id;
+ int completed_ret; // INT_MAX if not completed
-+ char targetfile[PATH_MAX];
+ BdrvDirtyBitmap *bitmap;
+ BlockDriverState *target;
+ BlockJob *job;
@@ -1571,9 +1570,6 @@ index 0000000000..ef1738af52
+ bdrv_co_unref(di->target);
+ }
+
-+ if (di->targetfile[0]) {
-+ unlink(di->targetfile);
-+ }
+ g_free(di);
+ }
+ g_list_free(di_list);
diff --git a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
index 74cf735..aab05b8 100644
--- a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
+++ b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
@@ -174,10 +174,10 @@ index 0000000000..887e998b9e
+ NULL);
+}
diff --git a/pve-backup.c b/pve-backup.c
-index ef1738af52..91f7be00f4 100644
+index c755bf302b..5ebb6a3947 100644
--- a/pve-backup.c
+++ b/pve-backup.c
-@@ -1089,6 +1089,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+@@ -1085,6 +1085,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
ret->pbs_library_version = g_strdup(proxmox_backup_qemu_version());
ret->pbs_dirty_bitmap = true;
ret->pbs_dirty_bitmap_savevm = true;
diff --git a/debian/patches/pve/0050-PVE-backup-add-fleecing-option.patch b/debian/patches/pve/0050-PVE-backup-add-fleecing-option.patch
index 942db25..dbb2883 100644
--- a/debian/patches/pve/0050-PVE-backup-add-fleecing-option.patch
+++ b/debian/patches/pve/0050-PVE-backup-add-fleecing-option.patch
@@ -80,7 +80,7 @@ index 5000c084c5..70b3de4c7e 100644
hmp_handle_error(mon, error);
diff --git a/pve-backup.c b/pve-backup.c
-index 91f7be00f4..ec82d7d827 100644
+index 5ebb6a3947..a747d12d3d 100644
--- a/pve-backup.c
+++ b/pve-backup.c
@@ -7,9 +7,11 @@
@@ -111,7 +111,7 @@ index 91f7be00f4..ec82d7d827 100644
size_t size;
uint64_t block_size;
uint8_t dev_id;
-@@ -354,6 +363,22 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+@@ -353,6 +362,22 @@ static void pvebackup_complete_cb(void *opaque, int ret)
PVEBackupDevInfo *di = opaque;
di->completed_ret = ret;
@@ -134,7 +134,7 @@ index 91f7be00f4..ec82d7d827 100644
/*
* Needs to happen outside of coroutine, because it takes the graph write lock.
*/
-@@ -520,9 +545,77 @@ static void create_backup_jobs_bh(void *opaque) {
+@@ -519,9 +544,77 @@ static void create_backup_jobs_bh(void *opaque) {
}
bdrv_drained_begin(di->bs);
@@ -214,7 +214,7 @@ index 91f7be00f4..ec82d7d827 100644
BLOCKDEV_ON_ERROR_REPORT, JOB_DEFAULT, pvebackup_complete_cb, di, backup_state.txn,
&local_err);
-@@ -578,6 +671,14 @@ static void create_backup_jobs_bh(void *opaque) {
+@@ -577,6 +670,14 @@ static void create_backup_jobs_bh(void *opaque) {
aio_co_enter(data->ctx, data->co);
}
@@ -229,7 +229,7 @@ index 91f7be00f4..ec82d7d827 100644
/*
* Returns a list of device infos, which needs to be freed by the caller. In
* case of an error, errp will be set, but the returned value might still be a
-@@ -585,6 +686,7 @@ static void create_backup_jobs_bh(void *opaque) {
+@@ -584,6 +685,7 @@ static void create_backup_jobs_bh(void *opaque) {
*/
static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
const char *devlist,
@@ -237,7 +237,7 @@ index 91f7be00f4..ec82d7d827 100644
Error **errp)
{
gchar **devs = NULL;
-@@ -608,6 +710,31 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
+@@ -607,6 +709,31 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
}
PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
di->bs = bs;
@@ -269,7 +269,7 @@ index 91f7be00f4..ec82d7d827 100644
di_list = g_list_append(di_list, di);
d++;
}
-@@ -657,6 +784,7 @@ UuidInfo coroutine_fn *qmp_backup(
+@@ -656,6 +783,7 @@ UuidInfo coroutine_fn *qmp_backup(
const char *devlist,
bool has_speed, int64_t speed,
bool has_max_workers, int64_t max_workers,
@@ -277,7 +277,7 @@ index 91f7be00f4..ec82d7d827 100644
Error **errp)
{
assert(qemu_in_coroutine());
-@@ -685,7 +813,7 @@ UuidInfo coroutine_fn *qmp_backup(
+@@ -684,7 +812,7 @@ UuidInfo coroutine_fn *qmp_backup(
format = has_format ? format : BACKUP_FORMAT_VMA;
bdrv_graph_co_rdlock();
@@ -286,7 +286,7 @@ index 91f7be00f4..ec82d7d827 100644
bdrv_graph_co_rdunlock();
if (local_err) {
error_propagate(errp, local_err);
-@@ -1093,5 +1221,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+@@ -1089,5 +1217,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
ret->query_bitmap_info = true;
ret->pbs_masterkey = true;
ret->backup_max_workers = true;
diff --git a/debian/patches/pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch b/debian/patches/pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch
index 9303baa..4522d37 100644
--- a/debian/patches/pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch
+++ b/debian/patches/pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch
@@ -96,10 +96,10 @@ index dc6cafe7fa..a27d2d7d9f 100644
#endif /* COPY_BEFORE_WRITE_H */
diff --git a/pve-backup.c b/pve-backup.c
-index ec82d7d827..1694fc89b9 100644
+index a747d12d3d..4e730aa3da 100644
--- a/pve-backup.c
+++ b/pve-backup.c
-@@ -375,6 +375,15 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+@@ -374,6 +374,15 @@ static void pvebackup_complete_cb(void *opaque, int ret)
di->fleecing.snapshot_access = NULL;
}
if (di->fleecing.cbw) {
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-06-14 13:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-14 13:28 [pve-devel] applied: [PATCH qemu] PVE backup: remove unused targetfile member from device info Fiona Ebner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal