From 808e771e835a5ae6278809485185136b5f8705ec Mon Sep 17 00:00:00 2001
From: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Date: Wed, 6 May 2015 16:07:40 +0200
Subject: [PATCH] qemu: multiqueue for ccw devices
Allow ccw devices to be used with multiqueues. ccw provides a one to
one relation of fds to queues and does not support the vectors option.
Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Reviewed-by: Daniel Hansel <daniel.hansel@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
src/qemu/qemu_command.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 68844fa973..fe4622ef7c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5129,9 +5129,17 @@ qemuBuildNicDevStr(virDomainDefPtr def,
}
}
if (usingVirtio && vhostfdSize > 1) {
- /* As advised at http://www.linux-kvm.org/page/Multiqueue
- * we should add vectors=2*N+2 where N is the vhostfdSize */
- virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2);
+ if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
+ /* ccw provides a one to one relation of fds to queues and
+ * does not support the vectors option
+ */
+ virBufferAddLit(&buf, ",mq=on");
+ } else {
+ /* As advised at http://www.linux-kvm.org/page/Multiqueue
+ * we should add vectors=2*N+2 where N is the vhostfdSize
+ */
+ virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2);
+ }
}
if (vlan == -1)
virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias);