[Xen-changelog] [xen-3.2-testing] ioemu: Two qcow2 bug fixes from upstream qemu.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206977959 -3600
# Node ID 53ba4903170f9d5ca30ca1c46373610981fc757c
# Parent  962b23255cb7cc7036f8edca395f717be6c87bd7
ioemu: Two qcow2 bug fixes from upstream qemu.

[Qemu-devel] PATCH: qcow2 image corruption
http://lists.gnu.org/archive/html/qemu-devel/2007-03/msg00773.html

[Qemu-devel] [PATCH] qcow2: release refcount table clusters of the old
table, after growing the refcount table
http://lists.gnu.org/archive/html/qemu-devel/2007-04/msg00043.html

Signed-off-by: Kevin Wolf <kwolf@xxxxxxx>
xen-unstable changeset:   17312:892a20f824a7aa5c5ed57ce80fc61f1dffd4b4d2
xen-unstable date:        Thu Mar 27 17:14:41 2008 +0000
---
 tools/ioemu/block-qcow2.c |    6 ++++++
 1 files changed, 6 insertions(+)

diff -r 962b23255cb7 -r 53ba4903170f tools/ioemu/block-qcow2.c
--- a/tools/ioemu/block-qcow2.c Fri Mar 28 17:59:32 2008 +0000
+++ b/tools/ioemu/block-qcow2.c Mon Mar 31 16:39:19 2008 +0100
@@ -1886,6 +1886,8 @@ static int grow_refcount_table(BlockDriv
     int64_t table_offset;
     uint64_t data64;
     uint32_t data32;
+    int old_table_size;
+    int64_t old_table_offset;
 
     if (min_size <= s->refcount_table_size)
         return 0;
@@ -1931,10 +1933,14 @@ static int grow_refcount_table(BlockDriv
                     &data32, sizeof(data32)) != sizeof(data32))
         goto fail;
     qemu_free(s->refcount_table);
+    old_table_offset = s->refcount_table_offset;
+    old_table_size = s->refcount_table_size;
     s->refcount_table = new_table;
     s->refcount_table_size = new_table_size;
+    s->refcount_table_offset = table_offset;
 
     update_refcount(bs, table_offset, new_table_size2, 1);
+    free_clusters(bs, old_table_offset, old_table_size * sizeof(uint64_t));
     return 0;
  fail:
     free_clusters(bs, table_offset, new_table_size2);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog