fix backup monitor command

diff --git a/debian/patches/0003-add-backup-related-monitor-commands.patch b/debian/patches/0003-add-backup-related-monitor-commands.patch
index 70efeff06fb79fe0ef4995c1d347325a63264315..84f053d4e55123074bafcd13e684e9f90bb1ea16 100644 (file)
--- a/debian/patches/0003-add-backup-related-monitor-commands.patch
+++ b/debian/patches/0003-add-backup-related-monitor-commands.patch
@@ -1,4 +1,4 @@
-From 205f75f449050565262aff7e4fe245e70a659483 Mon Sep 17 00:00:00 2001
+From 262dc0d9c9f729dd5f74fc8772738207a4c1359d Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Tue, 13 Nov 2012 11:27:56 +0100
 Subject: [PATCH v3 3/6] add backup related monitor commands
@@ -45,7 +45,7 @@ index e1f0290..ae4aa8c 100644
 +
  #endif /* QEMU_BACKUP_H */
 diff --git a/blockdev.c b/blockdev.c
-index e73fd6e..9e85ffe 100644
+index e73fd6e..e89aa14 100644
 --- a/blockdev.c
 +++ b/blockdev.c
 @@ -20,6 +20,7 @@
@@ -231,7 +231,7 @@ index e73fd6e..9e85ffe 100644
 +    }
 +
 +    if (has_devlist) {
-+        devs = g_strsplit(devlist, ",;:", -1);
++        devs = g_strsplit_set(devlist, ",;:", -1);
 +
 +        gchar **d = devs;
 +        while (d && *d) {

diff --git a/debian/patches/0004-introduce-new-vma-archive-format.patch b/debian/patches/0004-introduce-new-vma-archive-format.patch
index 2d96fe151e20284ee12464bda5c65e64dcc46de9..f7c24832b7bcc08fb887e4a2a6099c54fc2ba607 100644 (file)
--- a/debian/patches/0004-introduce-new-vma-archive-format.patch
+++ b/debian/patches/0004-introduce-new-vma-archive-format.patch
@@ -1,4 +1,4 @@
-From a259716ad384f2d23992b89f714497e2dc8b7336 Mon Sep 17 00:00:00 2001
+From e85ba881045bcd48a285d17234ebe32d10735492 Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Tue, 13 Nov 2012 11:11:38 +0100
 Subject: [PATCH v3 4/6] introduce new vma archive format
@@ -57,7 +57,7 @@ index cb46be5..b5732e2 100644
  block-obj-$(CONFIG_POSIX) += event_notifier-posix.o aio-posix.o
  block-obj-$(CONFIG_WIN32) += event_notifier-win32.o aio-win32.o
 diff --git a/blockdev.c b/blockdev.c
-index 9e85ffe..139e350 100644
+index e89aa14..6764e73 100644
 --- a/blockdev.c
 +++ b/blockdev.c
 @@ -21,6 +21,7 @@

diff --git a/debian/patches/0005-add-regression-tests-for-backup.patch b/debian/patches/0005-add-regression-tests-for-backup.patch
index 785c7b29935d6826a580f31402892aa8850efe81..3dff6ee7138c5f5703ec57d9ea501791e28d7da6 100644 (file)
--- a/debian/patches/0005-add-regression-tests-for-backup.patch
+++ b/debian/patches/0005-add-regression-tests-for-backup.patch
@@ -1,4 +1,4 @@
-From bc2cfdba56c1a5071a1436384280d9b7f7501f12 Mon Sep 17 00:00:00 2001
+From 5888766e8fa9a63452d2360287cdfca18ce8f65c Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Wed, 14 Nov 2012 09:57:04 +0100
 Subject: [PATCH v3 5/6] add regression tests for backup

diff --git a/debian/patches/0006-add-vm-state-to-backups.patch b/debian/patches/0006-add-vm-state-to-backups.patch
index 39cfe13bf0775630dd6129791075e001b347ccc3..4b005e7d0118256fbea6de9181e4951e022ff3f8 100644 (file)
--- a/debian/patches/0006-add-vm-state-to-backups.patch
+++ b/debian/patches/0006-add-vm-state-to-backups.patch
@@ -1,4 +1,4 @@
-From 936c3272e09bc60de51ef985f7ec651051f924a8 Mon Sep 17 00:00:00 2001
+From bdba2b1d5a3dbe26635c953cbf545ce302b3aa57 Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Thu, 29 Nov 2012 10:46:49 +0100
 Subject: [PATCH v3 6/6] add vm state to backups
@@ -12,7 +12,7 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
  3 files changed, 199 insertions(+), 5 deletions(-)
 
 diff --git a/blockdev.c b/blockdev.c
-index 139e350..087af8c 100644
+index 6764e73..4f7e38b 100644
 --- a/blockdev.c
 +++ b/blockdev.c
 @@ -22,6 +22,8 @@