Repository: cloudstack Updated Branches: refs/heads/master 1f8705724 -> 29b880066
kvm: add VMXNET3 nic adapter to nic models Linux kernel supports vmxnet3, allowing it in KVM plugin would allow us to run ESX hosts on KVM hosts using CloudStack with vmxnet3 nic which can be passed as VM's nicAdapter detail Signed-off-by: Rohit Yadav <[email protected]> (cherry picked from commit e02d787f303c9f463f197337f1cd88032d776c1c) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29b88006 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29b88006 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29b88006 Branch: refs/heads/master Commit: 29b88006607a88797f0c657c79b3148eeb548654 Parents: 1f87057 Author: Rohit Yadav <[email protected]> Authored: Tue Apr 28 18:09:29 2015 +0200 Committer: Rohit Yadav <[email protected]> Committed: Tue Apr 28 18:23:55 2015 +0200 ---------------------------------------------------------------------- .../kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29b88006/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index bd6e042..9be12c3 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -784,7 +784,7 @@ public class LibvirtVMDef { } enum nicModel { - E1000("e1000"), VIRTIO("virtio"), RTL8139("rtl8139"), NE2KPCI("ne2k_pci"); + E1000("e1000"), VIRTIO("virtio"), RTL8139("rtl8139"), NE2KPCI("ne2k_pci"), VMXNET3("vmxnet3"); String _model; nicModel(String model) {
