[PATCH] ioemu: Merge qcow2 fixes from qemu

[PATCH] ioemu: Merge qcow2 fixes from qemu

[Kevin Wolf]

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

The following two fixes by Jürgen Keil have been in qemu for a year now.
They are still missing in ioemu.

[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@suse.de>

[-- Attachment #2: ioemu-qcow2-merge.patch --]
[-- Type: text/x-patch, Size: 961 bytes --]

diff -r 81147306041a tools/ioemu/block-qcow2.c
--- a/tools/ioemu/block-qcow2.c	Tue Mar 25 14:37:43 2008
+++ b/tools/ioemu/block-qcow2.c	Thu Mar 27 13:59:33 2008
@@ -1886,6 +1886,8 @@
     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 @@
                     &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);

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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