Fixes broken -netdev + legacy virtio in Qemu support.

gns3server/modules/qemu/qemu_vm.py

@@ -999,18 +999,18 @@ class QemuVM(object):
                 if self._legacy_networking:
                     self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
                     self._control_vm("host_net_add udp vlan={},name=gns3-{},sport={},dport={},daddr={}".format(adapter_id,
-                                                                                                              adapter_id,
-                                                                                                              nio.lport,
-                                                                                                              nio.rport,
-                                                                                                              nio.rhost))
+                                                                                                               adapter_id,
+                                                                                                               nio.lport,
+                                                                                                               nio.rport,
+                                                                                                               nio.rhost))
                 else:
-                    self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
-                    self._control_vm("host_net_add socket vlan={},name=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
-                                                                                                                adapter_id,
-                                                                                                                nio.rhost,
-                                                                                                                nio.rport,
-                                                                                                                self._host,
-                                                                                                                nio.lport))
+                    #FIXME: does it work? very undocumented feature...
+                    self._control_vm("netdev_del gns3-{}".format(adapter_id))
+                    self._control_vm("netdev_add socket,id=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
+                                                                                                     nio.rhost,
+                                                                                                     nio.rport,
+                                                                                                     self._host,
+                                                                                                     nio.lport))
 
         adapter.add_nio(0, nio)
         log.info("QEMU VM {name} [id={id}]: {nio} added to adapter {adapter_id}".format(name=self._name,
@@ -1035,8 +1035,13 @@ class QemuVM(object):
 
         if self.is_running():
             # dynamically disable the QEMU VM adapter
-            self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
-            self._control_vm("host_net_add user vlan={},name=gns3-{}".format(adapter_id, adapter_id))
+            if self._legacy_networking:
+                self._control_vm("host_net_remove {} gns3-{}".format(adapter_id, adapter_id))
+                self._control_vm("host_net_add user vlan={},name=gns3-{}".format(adapter_id, adapter_id))
+            else:
+                #FIXME: does it work? very undocumented feature...
+                self._control_vm("netdev_del gns3-{}".format(adapter_id))
+                self._control_vm("netdev_add user,id=gns3-{}".format(adapter_id))
 
         nio = adapter.get_nio(0)
         adapter.remove_nio(0)
@@ -1192,24 +1197,30 @@ class QemuVM(object):
         for adapter in self._ethernet_adapters:
             #TODO: let users specify a base mac address
             mac = "00:00:ab:%02x:%02x:%02d" % (random.randint(0x00, 0xff), random.randint(0x00, 0xff), adapter_id)
-            network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_id, mac, self._adapter_type)])
+            if self._legacy_networking:
+                network_options.extend(["-net", "nic,vlan={},macaddr={},model={}".format(adapter_id, mac, self._adapter_type)])
+            else:
+                network_options.extend(["-device", "{},mac={},netdev=gns3-{}".format(self._adapter_type, mac, adapter_id)])
+
             nio = adapter.get_nio(0)
             if nio and isinstance(nio, NIO_UDP):
                 if self._legacy_networking:
                     network_options.extend(["-net", "udp,vlan={},name=gns3-{},sport={},dport={},daddr={}".format(adapter_id,
-                                                                                                                adapter_id,
-                                                                                                                nio.lport,
-                                                                                                                nio.rport,
-                                                                                                                nio.rhost)])
+                                                                                                                 adapter_id,
+                                                                                                                 nio.lport,
+                                                                                                                 nio.rport,
+                                                                                                                 nio.rhost)])
                 else:
-                    network_options.extend(["-net", "socket,vlan={},name=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
-                                                                                                                  adapter_id,
-                                                                                                                  nio.rhost,
-                                                                                                                  nio.rport,
-                                                                                                                  self._host,
-                                                                                                                  nio.lport)])
+                    network_options.extend(["-netdev", "socket,id=gns3-{},udp={}:{},localaddr={}:{}".format(adapter_id,
+                                                                                                            nio.rhost,
+                                                                                                            nio.rport,
+                                                                                                            self._host,
+                                                                                                            nio.lport)])
             else:
-                network_options.extend(["-net", "user,vlan={},name=gns3-{}".format(adapter_id, adapter_id)])
+                if self._legacy_networking:
+                    network_options.extend(["-net", "user,vlan={},name=gns3-{}".format(adapter_id, adapter_id)])
+                else:
+                    network_options.extend(["-netdev", "user,id=gns3-{}".format(adapter_id)])
             adapter_id += 1
 
         return network_options