Merge qcow2 fixes from qemu-devel (cvs):

- Qcow2 corruption fix, by Juergen Keil.
- Qcow2: Release refcount table clusters after growing the refcount table,
  by Juergen Keil.

2 files changed, 26 insertions, 1 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index fa995d21373..ac52a214aa4 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://qemu.org/:release \
 		http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \
diff --git a/emulators/qemu/files/patch-block-qcow2.c b/emulators/qemu/files/patch-block-qcow2.c
new file mode 100644
index 00000000000..e392c5114dd
--- /dev/null
+++ b/emulators/qemu/files/patch-block-qcow2.c
@@ -0,0 +1,25 @@
+Index: qemu/block-qcow2.c
+@@ -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);