From b09e76465a7560dcfa61ca12358cf03d48d8e772 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 13 Dec 2012 13:59:23 +0100 Subject: [PATCH] fix backup monitor command --- .../patches/0003-add-backup-related-monitor-commands.patch | 6 +++--- debian/patches/0004-introduce-new-vma-archive-format.patch | 4 ++-- debian/patches/0005-add-regression-tests-for-backup.patch | 2 +- debian/patches/0006-add-vm-state-to-backups.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/0003-add-backup-related-monitor-commands.patch b/debian/patches/0003-add-backup-related-monitor-commands.patch index 70efeff..84f053d 100644 --- 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 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 2d96fe1..f7c2483 100644 --- 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 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 785c7b2..3dff6ee 100644 --- 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 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 39cfe13..4b005e7 100644 --- 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 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 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 @@ -- 2.39.2