-From 5f03cca26a4ba9c08d6f6e19b97b6c6c1f0f236a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:15:49 +0100
-Subject: [PATCH 01/28] fr-ca keymap corrections
+Subject: [PATCH] fr-ca keymap corrections
---
pc-bios/keymaps/fr-ca | 9 +++++++++
-From 499c1880a00cd772bf85167cb2bb3f5ff4eb4d33 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:16:49 +0100
-Subject: [PATCH 02/28] Adjust network script path to /etc/kvm/
+Subject: [PATCH] Adjust network script path to /etc/kvm/
---
include/net/net.h | 5 +++--
-From 99ae84628c46f29cfce39c753801f91efe102a8c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:18:46 +0100
-Subject: [PATCH 03/28] qemu-img: return success on info without snapshots
+Subject: [PATCH] qemu-img: return success on info without snapshots
---
qemu-img.c | 3 ++-
-From f1e0cc0d0f287a8072a0f69fe1a10a0cf1cd6b49 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:27:05 +0100
-Subject: [PATCH 04/28] use kvm by default
+Subject: [PATCH] use kvm by default
---
accel.c | 4 ++--
-From 6b88624be0e6018ad674abdb01d6cb04fabc703e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:27:49 +0100
-Subject: [PATCH 05/28] virtio-balloon: fix query
+Subject: [PATCH] virtio-balloon: fix query
Actually provide memory information via the query-balloon
command.
-From f321f239eb7d28861a16d6f941bd3b756621147c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:30:21 +0100
-Subject: [PATCH 06/28] set the CPU model to kvm64/32 instead of qemu64/32
+Subject: [PATCH] set the CPU model to kvm64/32 instead of qemu64/32
---
hw/i386/pc.c | 4 ++--
-From ba17137d9645c421717b20aef09fed3945dc6d14 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:31:18 +0100
-Subject: [PATCH 07/28] qapi: modify query machines
+Subject: [PATCH] qapi: modify query machines
provide '*is-current' in MachineInfo struct
---
-From d31b55269adad7b160a0942e7c887d3ec754f7d3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:32:11 +0100
-Subject: [PATCH 08/28] qapi: modify spice query
+Subject: [PATCH] qapi: modify spice query
Provide the last ticket in the SpiceInfo struct optionally.
---
-From 6eb3751cbdb888cf3a0b8e481ef7faa3f58f67cb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:33:34 +0100
-Subject: [PATCH 09/28] ui/spice: default to pve certs unless otherwise
- specified
+Subject: [PATCH] ui/spice: default to pve certs unless otherwise specified
---
ui/spice-core.c | 15 +++++++++------
-From 27d7cf1b94244a56cd0e8a408af3e40a84dace81 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 16:04:32 +0100
-Subject: [PATCH 10/28] internal snapshot async
+Subject: [PATCH] internal snapshot async
---
Makefile.objs | 1 +
-From bed6817c14a520409f4ffee05e635c988c8b5994 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 8 Nov 2016 11:13:06 +0100
-Subject: [PATCH 11/28] convert savevm-async to threads
+Subject: [PATCH] convert savevm-async to threads
---
savevm-async.c | 144 +++++++++++++++++++++++++++++++++++----------------------
-From a43e451816ebd6d961412b0d88597c79eb6dd478 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 16:34:41 +0100
-Subject: [PATCH 12/28] qmp: add get_link_status
+Subject: [PATCH] qmp: add get_link_status
---
net/net.c | 27 +++++++++++++++++++++++++++
-From 8d4dc658bad2438d6225d261aae8647088b853a1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 29 Sep 2015 15:37:44 +0200
-Subject: [PATCH 13/28] smm_available = false
+Subject: [PATCH] smm_available = false
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
-From 4c989793d0df71e8f90da8c8f883d42a8aa92191 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 16:50:05 +0100
-Subject: [PATCH 14/28] use whitespace between VERSION and PKGVERSION
+Subject: [PATCH] use whitespace between VERSION and PKGVERSION
Our kvm version parser expects a white space or comma after
the version string, see PVE::QemuServer::kvm_user_version()
-From 9082b919824dbedc5c3aa04369abb2f433ef6ec1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 14:17:38 +0100
-Subject: [PATCH 15/28] vnc: altgr emulation
+Subject: [PATCH] vnc: altgr emulation
---
ui/vnc.c | 26 +++++++++++++++++++++++++-
-From 78f096b96d63ed2e7eefd5826c5b8ef62f1244eb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 12 Jan 2016 09:09:49 +0100
-Subject: [PATCH 16/28] vnc: make x509 imply tls again
+Subject: [PATCH] vnc: make x509 imply tls again
---
ui/vnc.c | 5 ++---
-From 981ee6783da6e4d5905fcc972950296187a55c0d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 11 Jan 2016 10:40:31 +0100
-Subject: [PATCH 17/28] vnc: PVE VNC authentication
+Subject: [PATCH] vnc: PVE VNC authentication
---
crypto/tlscreds.c | 47 +++++++++++
-From 9398ed96d5c02451ec85a3fcea2284b6efd4b7a8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 6 Apr 2016 16:45:15 +0200
-Subject: [PATCH 18/28] migrate: fix possible unitialised return value
+Subject: [PATCH] migrate: fix possible unitialised return value
---
migration/savevm.c | 2 +-
-From 24fea0d7356b39d70dde9eb683183ed5c67a4ac9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 26 Jul 2016 16:51:00 +0200
-Subject: [PATCH 19/28] block: rbd: disable rbd_cache_writethrough_until_flush
- with cache=unsafe
+Subject: [PATCH] block: rbd: disable rbd_cache_writethrough_until_flush with
+ cache=unsafe
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
-From dccd9887366b5df7eeb8394cc0476536ebc8dd45 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 13 Sep 2016 01:57:56 +0200
-Subject: [PATCH 20/28] block: snapshot: qmp_snapshot_drive: add aiocontext
+Subject: [PATCH] block: snapshot: qmp_snapshot_drive: add aiocontext
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
-From e46b7bfe99cf88021d65b7796318066b1326ad53 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Mon, 7 Nov 2016 11:47:50 +0100
-Subject: [PATCH 21/28] block: snapshot: qmp_delete_drive_snapshot : add
- aiocontext
+Subject: [PATCH] block: snapshot: qmp_delete_drive_snapshot : add aiocontext
this fix snapshot delete of qcow2 with iothread enabled
-From a53fb2c9746d90e6020a0d7e5e8e2e346c81fb99 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 24 Oct 2016 09:32:36 +0200
-Subject: [PATCH 22/28] glusterfs: no default logfile if daemonized
+Subject: [PATCH] glusterfs: no default logfile if daemonized
---
block/gluster.c | 15 +++++++++++----
-From b7b68751ac7a5779872611ee1084be52b7645988 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 30 Nov 2016 10:27:47 +0100
-Subject: [PATCH 23/28] glusterfs: allow partial reads
+Subject: [PATCH] glusterfs: allow partial reads
This should deal with qemu bug #1644754 until upstream
decides which way to go. The general direction seems to be
-From 728c38cd3035da76df02cf955c0452c3401eb3f3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Thu, 17 Mar 2016 11:33:37 +0100
-Subject: [PATCH 24/28] block: add the zeroinit block driver filter
+Subject: [PATCH] block: add the zeroinit block driver filter
---
block/Makefile.objs | 1 +
-From e1031eef2db9f19cd09c21ba36f0d106528d8df0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Fri, 23 Jun 2017 12:01:43 +0200
-Subject: [PATCH 25/28] qemu-img dd: add osize and read from/to stdin/stdout
+Subject: [PATCH] qemu-img dd: add osize and read from/to stdin/stdout
Neither convert nor dd were previously able to write to or
read from a pipe. Particularly serializing an image file
-From 6017af4918c9795a7f98a463426e1e21065b15d5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 9 Dec 2015 15:04:57 +0100
-Subject: [PATCH 26/28] backup: modify job api
+Subject: [PATCH] backup: modify job api
Introduce a pause_count parameter to start a backup in
paused mode. This way backups of multiple drives can be
-From fb4bcaaced8119f2b99d1621fdfe5fce159311f4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 2 Aug 2017 13:51:02 +0200
-Subject: [PATCH 27/28] backup: introduce vma archive format
+Subject: [PATCH] backup: introduce vma archive format
---
MAINTAINERS | 6 +
block/Makefile.objs | 3 +
block/vma.c | 424 +++++++++++++++++++++++++++++++++++++++++++
- blockdev.c | 499 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ blockdev.c | 498 +++++++++++++++++++++++++++++++++++++++++++++++++++
configure | 30 ++++
hmp-commands-info.hx | 13 ++
hmp-commands.hx | 31 ++++
hmp.h | 3 +
qapi-schema.json | 91 ++++++++++
qapi/block-core.json | 20 ++-
- 11 files changed, 1181 insertions(+), 2 deletions(-)
+ 11 files changed, 1180 insertions(+), 2 deletions(-)
create mode 100644 block/vma.c
diff --git a/MAINTAINERS b/MAINTAINERS
+
+block_init(bdrv_vma_init);
diff --git a/blockdev.c b/blockdev.c
-index 9b6cfafd33..e23eb16fc8 100644
+index 9b6cfafd33..534c00f5da 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -31,10 +31,12 @@
#include "block/throttle-groups.h"
#include "monitor/monitor.h"
#include "qemu/error-report.h"
-@@ -2932,6 +2934,503 @@ out:
+@@ -2932,6 +2934,502 @@ out:
aio_context_release(aio_context);
}
+static void pvebackup_run_next_job(void)
+{
+ bool cancel = backup_state.error || backup_state.cancel;
-+fprintf(stderr, "run next job: %zu\n", backup_state.next_job);
+ GList *next = g_list_nth(backup_state.di_list, backup_state.next_job);
+ while (next) {
+ PVEBackupDevInfo *di = (PVEBackupDevInfo *)next->data;
-From bda9612a0dc8b39b73c8e99a149f2aa967a056a3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 7 Aug 2017 08:51:16 +0200
-Subject: [PATCH 28/28] adding old vma files
+Subject: [PATCH] adding old vma files
---
Makefile | 3 +-
Makefile.objs | 1 +
block/backup.c | 132 ++++---
block/replication.c | 1 +
- blockdev.c | 250 +++++++++-----
+ blockdev.c | 249 +++++++++-----
blockjob.c | 11 +-
include/block/block_int.h | 4 +
vma-reader.c | 857 ++++++++++++++++++++++++++++++++++++++++++++++
vma-writer.c | 771 +++++++++++++++++++++++++++++++++++++++++
vma.c | 757 ++++++++++++++++++++++++++++++++++++++++
vma.h | 149 ++++++++
- 11 files changed, 2802 insertions(+), 134 deletions(-)
+ 11 files changed, 2802 insertions(+), 133 deletions(-)
create mode 100644 vma-reader.c
create mode 100644 vma-writer.c
create mode 100644 vma.c
if (local_err) {
error_propagate(errp, local_err);
diff --git a/blockdev.c b/blockdev.c
-index e23eb16fc8..19a82e8774 100644
+index 534c00f5da..19a82e8774 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -31,7 +31,6 @@
g_free(cdata);
g_free(basename);
return 1;
-@@ -3089,35 +3187,37 @@ static int config_to_vma(const char *file, BackupFormat format,
+@@ -3089,34 +3187,37 @@ static int config_to_vma(const char *file, BackupFormat format,
g_free(basename);
g_free(cdata);
static void pvebackup_run_next_job(void)
{
- bool cancel = backup_state.error || backup_state.cancel;
--fprintf(stderr, "run next job: %zu\n", backup_state.next_job);
- GList *next = g_list_nth(backup_state.di_list, backup_state.next_job);
- while (next) {
- PVEBackupDevInfo *di = (PVEBackupDevInfo *)next->data;
bool has_devlist, const char *devlist,
bool has_speed, int64_t speed, Error **errp)
{
-@@ -3125,14 +3225,15 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
+@@ -3124,14 +3225,15 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
BlockDriverState *bs = NULL;
const char *backup_dir = NULL;
Error *local_err = NULL;
error_set(errp, ERROR_CLASS_GENERIC_ERROR,
"previous backup not finished");
return NULL;
-@@ -3207,40 +3308,28 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
+@@ -3206,40 +3308,28 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
total += size;
}
goto err;
}
}
-@@ -3281,15 +3370,15 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
+@@ -3280,15 +3370,15 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
/* add configuration file to archive */
if (has_config_file) {
}
}
/* initialize global backup_state now */
-@@ -3311,11 +3400,12 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
+@@ -3310,11 +3400,12 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
}
backup_state.backup_file = g_strdup(backup_file);
backup_state.total = total;
backup_state.transferred = 0;
-@@ -3326,21 +3416,16 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
+@@ -3325,21 +3416,16 @@ UuidInfo *qmp_backup(const char *backup_file, bool has_format,
while (l) {
PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
l = g_list_next(l);
}
if (!backup_state.error) {
-@@ -3374,9 +3459,10 @@ err:
+@@ -3373,9 +3459,10 @@ err:
g_strfreev(devs);
}
}
if (backup_dir) {
-@@ -3761,7 +3847,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, BlockJobTxn *txn,
+@@ -3760,7 +3847,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, BlockJobTxn *txn,
job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
backup->sync, bmap, backup->compress,
backup->on_source_error, backup->on_target_error,
bdrv_unref(target_bs);
if (local_err != NULL) {
error_propagate(errp, local_err);
-@@ -3840,7 +3926,7 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,
+@@ -3839,7 +3926,7 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,
job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
backup->sync, NULL, backup->compress,
backup->on_source_error, backup->on_target_error,
-From 3cff3cff0dda09201386dff3c86c5e4fdb0b41b7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 5 Dec 2017 12:12:15 +0100
-Subject: [PATCH 2/2] backup: fix race in backup-stop command
+Subject: [PATCH] backup: fix race in backup-stop command
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
projects / pve-qemu.git / commitdiff