Adding a driver element with queues (#40)

* Adding a driver element with queues

* Adding queues to hot plugged locations

* Adding virtio model check

Author: nlgordon

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -1638,7 +1638,9 @@ private void VifHotPlug(final Connect conn, final String vmName, final String br
         }
 
         final Domain vm = getDomain(conn, vmName);
-        vm.attachDevice(getVifDriver(nicTO.getType()).plug(nicTO, "Other PV", "").toString());
+        InterfaceDef nic = getVifDriver(nicTO.getType()).plug(nicTO, "Other PV", "");
+        nic.setQueues(vm.getMaxVcpus());
+        vm.attachDevice(nic.toString());
     }
 
 
@@ -2195,7 +2197,7 @@ public void createVifs(final VirtualMachineTO vmSpec, final LibvirtVMDef vm) thr
         for (int i = 0; i < nics.length; i++) {
             for (final NicTO nic : vmSpec.getNics()) {
                 if (nic.getDeviceId() == i) {
-                    createVif(vm, nic, nicAdapter);
+                    createVif(vm, nic, nicAdapter, vmSpec.getCpus());
                 }
             }
         }
@@ -2387,7 +2389,7 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
 
     }
 
-    private void createVif(final LibvirtVMDef vm, final NicTO nic, final String nicAdapter) throws InternalErrorException, LibvirtException {
+    private void createVif(final LibvirtVMDef vm, final NicTO nic, final String nicAdapter, int queues) throws InternalErrorException, LibvirtException {
 
         if (nic.getType().equals(TrafficType.Guest) && nic.getBroadcastType().equals(BroadcastDomainType.Vsp)) {
             String vrIp = nic.getBroadcastUri().getPath().substring(1);
@@ -2399,7 +2401,9 @@ private void createVif(final LibvirtVMDef vm, final NicTO nic, final String nicA
             }
         }
 
-        vm.getDevices().addDevice(getVifDriver(nic.getType(), nic.getName()).plug(nic, vm.getPlatformEmulator(), nicAdapter));
+        InterfaceDef device = getVifDriver(nic.getType(), nic.getName()).plug(nic, vm.getPlatformEmulator(), nicAdapter);
+        device.setQueues(queues);
+        vm.getDevices().addDevice(device);
     }
 
     public boolean cleanupDisk(Map<String, String> volumeToDisconnect) {

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -957,6 +957,7 @@ enum HostNicType {
         private boolean _pxeDisable = false;
         private boolean _linkStateUp = true;
         private Integer _slot;
+        private Integer queues = 0;
 
         public void defBridgeNet(String brName, String targetBrName, String macAddr, NicModel model) {
             defBridgeNet(brName, targetBrName, macAddr, model, 0);
@@ -1096,6 +1097,14 @@ public boolean isLinkStateUp() {
             return _linkStateUp;
         }
 
+        public void setQueues(int queues) {
+            this.queues = queues;
+        }
+
+        public int getQueues() {
+            return this.queues;
+        }
+
         @Override
         public String toString() {
             StringBuilder netBuilder = new StringBuilder();
@@ -1144,6 +1153,9 @@ public String toString() {
             if (_slot  != null) {
                 netBuilder.append(String.format("<address type='pci' domain='0x0000' bus='0x00' slot='0x%02x' function='0x0'/>\n", _slot));
             }
+            if (_model == NicModel.VIRTIO && queues > 0) {
+                netBuilder.append(String.format("<driver queues='%d'/>\n", queues));
+            }
             netBuilder.append("</interface>\n");
             return netBuilder.toString();
         }

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java

@@ -62,6 +62,7 @@ public Answer execute(final PlugNicCommand command, final LibvirtComputingResour
             }
             final VifDriver vifDriver = libvirtComputingResource.getVifDriver(nic.getType(), nic.getName());
             final InterfaceDef interfaceDef = vifDriver.plug(nic, "Other PV", "");
+            interfaceDef.setQueues(vm.getMaxVcpus());
             vm.attachDevice(interfaceDef.toString());
 
             return new PlugNicAnswer(command, true, "success");

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapper.java

@@ -67,6 +67,7 @@ public Answer execute(final ReplugNicCommand command, final LibvirtComputingReso
             final VifDriver newVifDriver = libvirtComputingResource.getVifDriver(nic.getType(), nic.getName());
             final InterfaceDef interfaceDef = newVifDriver.plug(nic, "Other PV", oldPluggedNic.getModel().toString());
 
+            interfaceDef.setQueues(vm.getMaxVcpus());
             interfaceDef.setSlot(oldPluggedNic.getSlot());
             interfaceDef.setDevName(oldPluggedNic.getDevName());
             interfaceDef.setLinkStateUp(false);

plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java

@@ -60,6 +60,39 @@ public void testInterfaceDirectNet() {
         assertEquals(expected, ifDef.toString());
     }
 
+    public void testInterfaceDirectNetWithQueues() {
+        LibvirtVMDef.InterfaceDef ifDef = new LibvirtVMDef.InterfaceDef();
+        ifDef.defDirectNet("targetDeviceName", null, "00:11:22:aa:bb:dd", LibvirtVMDef.InterfaceDef.NicModel.VIRTIO, "private");
+        ifDef.setQueues(4);
+
+        String expected =
+                "<interface type='" + LibvirtVMDef.InterfaceDef.GuestNetType.DIRECT + "'>\n"
+                        + "<source dev='targetDeviceName' mode='private'/>\n"
+                        + "<mac address='00:11:22:aa:bb:dd'/>\n"
+                        + "<model type='virtio'/>\n"
+                        + "<link state='up'/>\n"
+                        + "<driver queues='4'/>\n"
+                        + "</interface>\n";
+
+        assertEquals(expected, ifDef.toString());
+    }
+
+    public void testInterfaceDirectNetE1000WithQueuesShouldNotAddDriver() {
+        LibvirtVMDef.InterfaceDef ifDef = new LibvirtVMDef.InterfaceDef();
+        ifDef.defDirectNet("targetDeviceName", null, "00:11:22:aa:bb:dd", LibvirtVMDef.InterfaceDef.NicModel.E1000, "private");
+        ifDef.setQueues(4);
+
+        String expected =
+                "<interface type='" + LibvirtVMDef.InterfaceDef.GuestNetType.DIRECT + "'>\n"
+                        + "<source dev='targetDeviceName' mode='private'/>\n"
+                        + "<mac address='00:11:22:aa:bb:dd'/>\n"
+                        + "<model type='e1000'/>\n"
+                        + "<link state='up'/>\n"
+                        + "</interface>\n";
+
+        assertEquals(expected, ifDef.toString());
+    }
+
     public void testInterfaceBridgeSlot() {
         LibvirtVMDef.InterfaceDef ifDef = new LibvirtVMDef.InterfaceDef();
         ifDef.defBridgeNet("targetDeviceName", null, "00:11:22:aa:bb:dd", LibvirtVMDef.InterfaceDef.NicModel.VIRTIO);