Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B872317DF2 for ; Thu, 7 May 2015 14:04:42 +0000 (UTC) Received: (qmail 43019 invoked by uid 500); 7 May 2015 14:04:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 42890 invoked by uid 500); 7 May 2015 14:04:40 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 42494 invoked by uid 99); 7 May 2015 14:04:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 May 2015 14:04:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39CE1E4428; Thu, 7 May 2015 14:04:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Thu, 07 May 2015 14:04:56 -0000 Message-Id: In-Reply-To: <178ef3558c1541d6aff754cc5de87157@git.apache.org> References: <178ef3558c1541d6aff754cc5de87157@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] git commit: updated refs/heads/master to 1c408de 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e02d787f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e02d787f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e02d787f Branch: refs/heads/master Commit: e02d787f303c9f463f197337f1cd88032d776c1c Parents: 9ccfc38 Author: Rohit Yadav Authored: Tue Apr 28 18:09:29 2015 +0200 Committer: Rohit Yadav Committed: Tue Apr 28 18:09:29 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/e02d787f/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) {