add vmxnet3 to list of available network card models

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 6d1083c45a251729e4fe6c404cf7edb104b7daa3..807ced79bedb23e4897f5885e141140e4780844e 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -465,7 +465,7 @@ my $MAX_SERIAL_PORTS = 4;
 my $MAX_PARALLEL_PORTS = 3;
 
 my $nic_model_list = ['rtl8139', 'ne2k_pci', 'e1000',  'pcnet',  'virtio',
-                     'ne2k_isa', 'i82551', 'i82557b', 'i82559er'];
+                     'ne2k_isa', 'i82551', 'i82557b', 'i82559er', 'vmxnet3'];
 my $nic_model_list_txt = join(' ', sort @$nic_model_list);
 
 my $netdesc = {
@@ -1220,7 +1220,7 @@ sub parse_net {
 
     foreach my $kvp (split(/,/, $data)) {
 
-       if ($kvp =~ m/^(ne2k_pci|e1000|rtl8139|pcnet|virtio|ne2k_isa|i82551|i82557b|i82559er)(=([0-9a-f]{2}(:[0-9a-f]{2}){5}))?$/i) {
+       if ($kvp =~ m/^(ne2k_pci|e1000|rtl8139|pcnet|virtio|ne2k_isa|i82551|i82557b|i82559er|vmxnet3)(=([0-9a-f]{2}(:[0-9a-f]{2}){5}))?$/i) {
            my $model = lc($1);
            my $mac = defined($3) ? uc($3) : PVE::Tools::random_ether_addr();
            $res->{model} = $model;

diff --git a/changelog.Debian b/changelog.Debian
index d8e915cd08f9acc6755e24ab16e2122511fd5b20..6f9754e54c32a21b1b3be69d1276e705a6ab497b 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -7,6 +7,9 @@ qemu-server (3.1-11) unstable; urgency=low
   * add 'pvscsi' to the list of scsi controllers (emulate the VMware
     PVSCSI device)
 
+  * add 'vmxnet3' to the list of available network card models (emulate
+    VMware paravirtualized network card)
+
  -- Proxmox Support Team <support@proxmox.com>  Tue, 03 Dec 2013 10:48:33 +0100
 
 qemu-server (3.1-10) unstable; urgency=low