From 9de54cd397d2315f3d6f5987098304c4b4e8b4f7 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 2 Jan 2013 08:28:44 +0100 Subject: [PATCH] fix vma patch We need to use bdrv_open instead of bdrv_file_open. --- .../patches/0004-introduce-new-vma-archive-format.patch | 8 ++++---- debian/patches/0005-add-regression-tests-for-backup.patch | 2 +- debian/patches/0006-add-vm-state-to-backups.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/patches/0004-introduce-new-vma-archive-format.patch b/debian/patches/0004-introduce-new-vma-archive-format.patch index f7c2483..4133ce0 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 e85ba881045bcd48a285d17234ebe32d10735492 Mon Sep 17 00:00:00 2001 +From 9fb6fd584178db5b5a9f0b59f78c30b3c3066f73 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 @@ -1847,7 +1847,7 @@ index 0000000..c1e1afe + diff --git a/vma.c b/vma.c new file mode 100644 -index 0000000..8d6f32d +index 0000000..d50a312 --- /dev/null +++ b/vma.c @@ -0,0 +1,558 @@ @@ -2151,8 +2151,8 @@ index 0000000..8d6f32d + write_zero = false; + } + -+ BlockDriverState *bs = NULL; -+ if (bdrv_file_open(&bs, devfn, flags)) { ++ BlockDriverState *bs = bdrv_new(di->devname); ++ if (bdrv_open(bs, devfn, flags, NULL)) { + g_error("can't open file %s", devfn); + } + if (vma_reader_register_bs(vmar, i, bs, write_zero, &errp) < 0) { diff --git a/debian/patches/0005-add-regression-tests-for-backup.patch b/debian/patches/0005-add-regression-tests-for-backup.patch index 3dff6ee..e79e247 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 5888766e8fa9a63452d2360287cdfca18ce8f65c Mon Sep 17 00:00:00 2001 +From da1ef0e71e40f35bc2274201fb28a58b09d53456 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 4b005e7..89a17a9 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 bdba2b1d5a3dbe26635c953cbf545ce302b3aa57 Mon Sep 17 00:00:00 2001 +From ca0d410ca44dcb666c6eecf8d8f2f4a18355950f 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 -- 2.39.2