[gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm/files: qemu-kvm-0.12.2-virtio-large-iovecs.patch

[Doug Goldstein (cardoe)]

cardoe      10/02/03 05:41:17

  Added:                qemu-kvm-0.12.2-virtio-large-iovecs.patch
  Log:
  upstream fix for virtio and certain use cases. Fixes issues people have seen with Ubuntu 10.04 guests and other distros
  (Portage version: 2.1.7.16/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-emulation/qemu-kvm/files/qemu-kvm-0.12.2-virtio-large-iovecs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/files/qemu-kvm-0.12.2-virtio-large-iovecs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/files/qemu-kvm-0.12.2-virtio-large-iovecs.patch?rev=1.1&content-type=text/plain

Index: qemu-kvm-0.12.2-virtio-large-iovecs.patch
===================================================================
Index: qemu/block.c
===================================================================
--- qemu.orig/block.c	2010-01-26 10:59:39.757004445 +0100
+++ qemu/block.c	2010-01-26 11:01:38.056023231 +0100
@@ -1689,6 +1689,10 @@ static int multiwrite_merge(BlockDriverS
             merge = bs->drv->bdrv_merge_requests(bs, &reqs[outidx], &reqs[i]);
         }
 
+        if (reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1 > IOV_MAX) {
+            merge = 0;
+        }
+
         if (merge) {
             size_t size;
             QEMUIOVector *qiov = qemu_mallocz(sizeof(*qiov));
Index: qemu/qemu-common.h
===================================================================
--- qemu.orig/qemu-common.h	2010-01-26 14:41:40.894254285 +0100
+++ qemu/qemu-common.h	2010-01-26 14:42:27.267275698 +0100
@@ -54,6 +54,10 @@ struct iovec {
     void *iov_base;
     size_t iov_len;
 };
+/*
+ * Use the same value as Linux for now.
+ */
+#define IOV_MAX		1024
 #else
 #include <sys/uio.h>
 #endif