From 0c94ea5029040ce3ab83c498db9b4ffb69d0e18a Mon Sep 17 00:00:00 2001
Message-Id: <0c94ea5029040ce3ab83c498db9b4ffb69d0e18a@dist-git>
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 4 Mar 2014 11:11:24 +0100
Subject: [PATCH] qemuBuildNicDevStr: Adapt to new advisory on multiqueue

https://bugzilla.redhat.com/show_bug.cgi?id=1071888

As I did previously in 4f588a1b46, libvirt needs to set virtio vectors.
Previously, we were advised to use vectors=N, where

N = 2 * (number of queues) + 1

However, just recently this advisory has changed on the Multiquue wiki
page [1] to:

N = 2 * (number of queues) + 2

1: http://www.linux-kvm.org/page/Multiqueue#Enable_MQ_feature

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
(cherry picked from commit 042c4ab1c933ef45012b703b5cbd776422f491c8)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_command.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 54c36e3..4d4474c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4904,8 +4904,8 @@ qemuBuildNicDevStr(virDomainDefPtr def,
     }
     if (usingVirtio && vhostfdSize > 1) {
         /* As advised at http://www.linux-kvm.org/page/Multiqueue
-         * we should add vectors=2*N+1 where N is the vhostfdSize */
-        virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 1);
+         * we should add vectors=2*N+2 where N is the vhostfdSize */
+        virBufferAsprintf(&buf, ",mq=on,vectors=%d", 2 * vhostfdSize + 2);
     }
     if (vlan == -1)
         virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias);
-- 
1.9.0