From 24c1c5a2bd5d0bd2db7257bb4b789a8b86aaaf0e Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 1 Feb 2014 07:48:04 -0500
Subject: [PATCH] cli: --network: Support driver_queues option

---
 tests/cli-test-xml/compare/many-devices.xml | 2 ++
 tests/clitest.py                            | 2 +-
 tests/xmlparse-xml/change-nics-out.xml      | 1 +
 tests/xmlparse.py                           | 2 ++
 virtinst/cli.py                             | 3 +++
 virtinst/deviceinterface.py                 | 2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/cli-test-xml/compare/many-devices.xml b/tests/cli-test-xml/compare/many-devices.xml
index 0b169b51b..a0d9d4355 100644
--- a/tests/cli-test-xml/compare/many-devices.xml
+++ b/tests/cli-test-xml/compare/many-devices.xml
@@ -81,6 +81,7 @@
       <source bridge="foobar"/>
       <mac address="00:11:22:33:44:55"/>
       <model type="virtio"/>
+      <driver name="qemu" queues="3"/>
     </interface>
     <interface type="direct">
       <source dev="eth5" mode="vepa"/>
@@ -199,6 +200,7 @@
       <source bridge="foobar"/>
       <mac address="00:11:22:33:44:55"/>
       <model type="virtio"/>
+      <driver name="qemu" queues="3"/>
     </interface>
     <interface type="direct">
       <source dev="eth5" mode="vepa"/>
diff --git a/tests/clitest.py b/tests/clitest.py
index ff1504be4..19ebe9a4a 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -552,7 +552,7 @@ c.add_compare("""--hvm --pxe \
 --serial tcp,host=:2222,mode=bind,protocol=telnet \
 --filesystem /source,/target,mode=squash \
 --network user,mac=12:34:56:78:11:22 \
---network bridge=foobar,model=virtio \
+--network bridge=foobar,model=virtio,driver_name=qemu,driver_queues=3 \
 --network type=direct,source=eth5,source_mode=vepa,target=mytap12,virtualport_type=802.1Qbg,virtualport_managerid=12,virtualport_typeid=1193046,virtualport_typeidversion=1,virtualport_instanceid=09b11c53-8b5c-4eeb-8f00-d84eaa0aaa3b \
 --channel spicevmc \
 --smartcard passthrough,type=spicevmc \
diff --git a/tests/xmlparse-xml/change-nics-out.xml b/tests/xmlparse-xml/change-nics-out.xml
index 6d3c368d5..d0f05561e 100644
--- a/tests/xmlparse-xml/change-nics-out.xml
+++ b/tests/xmlparse-xml/change-nics-out.xml
@@ -45,6 +45,7 @@
         <parameters managerid="11" typeid="1193047" typeidversion="2" instanceid="09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f"/>
       </virtualport>
       <address type="pci" domain="0x0000" bus="0x00" slot="0x07" function="0x0"/>
+      <driver name="vhost" queues="5"/>
     </interface>
     <input type="mouse" bus="ps2"/>
     <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index 5032ac98c..5f82365e8 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -450,6 +450,8 @@ class XMLParseTest(unittest.TestCase):
         check("type", "direct")
         check("source", "eth0.1")
         check("source_mode", "vepa", "bridge")
+        check("driver_name", None, "vhost")
+        check("driver_queues", None, 5)
 
         virtualport = dev5.virtualport
         check = self._make_checker(virtualport)
diff --git a/virtinst/cli.py b/virtinst/cli.py
index b503b7821..f9851b5f5 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -1795,6 +1795,9 @@ class ParserNetwork(VirtCLIParser):
         self.set_param("macaddr", "mac", setter_cb=set_mac_cb)
         self.set_param("filterref", "filterref")
 
+        self.set_param("driver_name", "driver_name")
+        self.set_param("driver_queues", "driver_queues")
+
         self.set_param("virtualport.type", "virtualport_type")
         self.set_param("virtualport.managerid", "virtualport_managerid")
         self.set_param("virtualport.typeid", "virtualport_typeid")
diff --git a/virtinst/deviceinterface.py b/virtinst/deviceinterface.py
index ed1bd7230..47ea8da53 100644
--- a/virtinst/deviceinterface.py
+++ b/virtinst/deviceinterface.py
@@ -230,6 +230,8 @@ class VirtualNetworkInterface(VirtualDevice):
     target_dev = XMLProperty("./target/@dev")
     filterref = XMLProperty("./filterref/@filter")
 
+    driver_name = XMLProperty("./driver/@name")
+    driver_queues = XMLProperty("./driver/@queues", is_int=True)
 
     #############
     # Build API #