* [pve-devel] [PATCH qemu] Fix spelling error in function name
@ 2023-09-08 8:49 Filip Schauer
2023-09-08 9:27 ` [pve-devel] applied: " Fiona Ebner
0 siblings, 1 reply; 2+ messages in thread
From: Filip Schauer @ 2023-09-08 8:49 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
...30-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 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 d873601..717845c 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
@@ -588,7 +588,7 @@ index 0000000000..8cbf645b2c
+#endif /* PROXMOX_BACKUP_CLIENT_H */
diff --git a/pve-backup.c b/pve-backup.c
new file mode 100644
-index 0000000000..10ca8a0b1d
+index 0000000000..7ea65125df
--- /dev/null
+++ b/pve-backup.c
@@ -0,0 +1,1109 @@
@@ -702,7 +702,7 @@ index 0000000000..10ca8a0b1d
+ return error_or_canceled;
+}
+
-+static void pvebackup_add_transfered_bytes(size_t transferred, size_t zero_bytes, size_t reused)
++static void pvebackup_add_transferred_bytes(size_t transferred, size_t zero_bytes, size_t reused)
+{
+ qemu_mutex_lock(&backup_state.stat.lock);
+ backup_state.stat.zero_bytes += zero_bytes;
@@ -763,7 +763,7 @@ index 0000000000..10ca8a0b1d
+ }
+
+ qemu_co_mutex_unlock(&backup_state.dump_callback_mutex);
-+ pvebackup_add_transfered_bytes(size, is_zero_block ? size : 0, reused);
++ pvebackup_add_transferred_bytes(size, is_zero_block ? size : 0, reused);
+
+ return size;
+}
@@ -821,11 +821,11 @@ index 0000000000..10ca8a0b1d
+ } else {
+ if (remaining >= VMA_CLUSTER_SIZE) {
+ assert(ret == VMA_CLUSTER_SIZE);
-+ pvebackup_add_transfered_bytes(VMA_CLUSTER_SIZE, zero_bytes, 0);
++ pvebackup_add_transferred_bytes(VMA_CLUSTER_SIZE, zero_bytes, 0);
+ remaining -= VMA_CLUSTER_SIZE;
+ } else {
+ assert(ret == remaining);
-+ pvebackup_add_transfered_bytes(remaining, zero_bytes, 0);
++ pvebackup_add_transferred_bytes(remaining, zero_bytes, 0);
+ remaining = 0;
+ }
+ }
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH qemu] Fix spelling error in function name
2023-09-08 8:49 [pve-devel] [PATCH qemu] Fix spelling error in function name Filip Schauer
@ 2023-09-08 9:27 ` Fiona Ebner
0 siblings, 0 replies; 2+ messages in thread
From: Fiona Ebner @ 2023-09-08 9:27 UTC (permalink / raw)
To: Proxmox VE development discussion, Filip Schauer
Am 08.09.23 um 10:49 schrieb Filip Schauer:
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
> ---
applied, thanks!
> 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 d873601..717845c 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
> @@ -588,7 +588,7 @@ index 0000000000..8cbf645b2c
> +#endif /* PROXMOX_BACKUP_CLIENT_H */
> diff --git a/pve-backup.c b/pve-backup.c
> new file mode 100644
> -index 0000000000..10ca8a0b1d
> +index 0000000000..7ea65125df
> --- /dev/null
> +++ b/pve-backup.c
> @@ -0,0 +1,1109 @@
But I had to fix up index and line context here, because it wasn't based
on latest master.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-08 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-08 8:49 [pve-devel] [PATCH qemu] Fix spelling error in function name Filip Schauer
2023-09-08 9:27 ` [pve-devel] applied: " Fiona Ebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox