[PATCH 2/2] KVM test: Add vhost-net support

From: Lucas Meneghel Rodrigues <lmr@redhat.com>
To: autotest@test.kernel.org
Cc: kvm@vger.kernel.org, mst@redhat.com
Subject: [PATCH 2/2] KVM test: Add vhost-net support
Date: Fri,  8 Oct 2010 12:28:13 -0300	[thread overview]
Message-ID: <1286551693-7872-3-git-send-email-lmr@redhat.com> (raw)
In-Reply-To: <1286551693-7872-1-git-send-email-lmr@redhat.com>

Vhost is a kernel-level backend for virtio. This patch add a nic_param
named "vhost" to enable/disable vhost backend.

Changes from v2:
- Rebase against latest HEAD

lmr - This one has problems so I'll hold on about applying this one.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 client/tests/kvm/kvm_vm.py             |    7 +++++--
 client/tests/kvm/tests_base.cfg.sample |    2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index 3388b14..848ff63 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -282,9 +282,11 @@ class VM:
 
         def add_net(help, vlan, mode, ifname=None, script=None,
                     downscript=None, tftp=None, bootfile=None, hostfwd=[],
-                    netdev_id=None):
+                    netdev_id=None, vhost=False):
             if has_option(help, "netdev"):
                 cmd = " -netdev %s,id=%s" % (mode, netdev_id)
+                if vhost:
+                    cmd +=",vhost=on"
             else:
                 cmd = " -net %s,vlan=%d" % (mode, vlan)
             if mode == "tap":
@@ -448,7 +450,8 @@ class VM:
                                 self.get_ifname(vlan),
                                 script, downscript, tftp,
                                 nic_params.get("bootp"), redirs,
-                                self.netdev_id[vlan])
+                                self.netdev_id[vlan],
+                                nic_params.get("vhost")=="yes")
             # Proceed to next NIC
             vlan += 1
 
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 8d62c42..e849f31 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -702,6 +702,8 @@ variants:
         # you can add advanced attributes on nic_extra_params
         # such as mrg_rxbuf
         #nic_extra_params =
+        # you can uncomment the following line to enable vhost-net backend
+        #vhost = yes
         jumbo:
             mtu = 65520
         ethtool:
-- 
1.7.2.3
