Skip to content

Commit b3bbcaf

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "QEMU/KVM: accept vmxnet3 NIC"
2 parents 295d202 + 7ba8f40 commit b3bbcaf

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

nova/tests/unit/virt/libvirt/test_vif.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,14 +840,16 @@ def test_model_kvm_qemu_parallels_custom(self):
840840
network_model.VIF_MODEL_RTL8139,
841841
network_model.VIF_MODEL_E1000,
842842
network_model.VIF_MODEL_E1000E,
843-
network_model.VIF_MODEL_SPAPR_VLAN)
843+
network_model.VIF_MODEL_SPAPR_VLAN,
844+
network_model.VIF_MODEL_VMXNET3)
844845
else:
845846
supported = (network_model.VIF_MODEL_NE2K_PCI,
846847
network_model.VIF_MODEL_PCNET,
847848
network_model.VIF_MODEL_RTL8139,
848849
network_model.VIF_MODEL_E1000,
849850
network_model.VIF_MODEL_E1000E,
850-
network_model.VIF_MODEL_SPAPR_VLAN)
851+
network_model.VIF_MODEL_SPAPR_VLAN,
852+
network_model.VIF_MODEL_VMXNET3)
851853
for model in supported:
852854
image_meta = objects.ImageMeta.from_dict(
853855
{'properties': {'hw_vif_model': model}})

nova/virt/libvirt/vif.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,17 @@
6767
network_model.VIF_MODEL_E1000,
6868
network_model.VIF_MODEL_E1000E,
6969
network_model.VIF_MODEL_LAN9118,
70-
network_model.VIF_MODEL_SPAPR_VLAN],
70+
network_model.VIF_MODEL_SPAPR_VLAN,
71+
network_model.VIF_MODEL_VMXNET3],
7172
'kvm': [
7273
network_model.VIF_MODEL_VIRTIO,
7374
network_model.VIF_MODEL_NE2K_PCI,
7475
network_model.VIF_MODEL_PCNET,
7576
network_model.VIF_MODEL_RTL8139,
7677
network_model.VIF_MODEL_E1000,
7778
network_model.VIF_MODEL_E1000E,
78-
network_model.VIF_MODEL_SPAPR_VLAN],
79+
network_model.VIF_MODEL_SPAPR_VLAN,
80+
network_model.VIF_MODEL_VMXNET3],
7981
'xen': [
8082
network_model.VIF_MODEL_NETFRONT,
8183
network_model.VIF_MODEL_NE2K_PCI,
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
features:
3+
- |
4+
Add the ability to use ``vmxnet3`` NIC on a host using the QEMU/KVM driver. This allows
5+
the migration of an ESXi VM to QEMU/KVM, without any driver changes. ``vmxnet3``
6+
comes with better performance and lower latency comparing to an emulated driver like
7+
``e1000``.

0 commit comments

Comments
 (0)