From patchwork Thu Mar 15 21:09:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Fleytman X-Patchwork-Id: 147106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9034EB6EEA for ; Fri, 16 Mar 2012 09:16:50 +1100 (EST) Received: from localhost ([::1]:42430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8I0V-0000To-3I for incoming@patchwork.ozlabs.org; Thu, 15 Mar 2012 17:14:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8Hzl-0007Dg-CN for qemu-devel@nongnu.org; Thu, 15 Mar 2012 17:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8HzR-0002nu-0p for qemu-devel@nongnu.org; Thu, 15 Mar 2012 17:14:00 -0400 Received: from na3sys010aog111.obsmtp.com ([74.125.245.90]:37520) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1S8HzQ-0002nc-OY for qemu-devel@nongnu.org; Thu, 15 Mar 2012 17:13:40 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]) (using TLSv1) by na3sys010aob111.postini.com ([74.125.244.12]) with SMTP ID DSNKT2JbgpwxtE/GseD5ugnSrXV6YSsishWq@postini.com; Thu, 15 Mar 2012 14:13:40 PDT Received: by mail-we0-f175.google.com with SMTP id a1so3789173wer.20 for ; Thu, 15 Mar 2012 14:13:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=DofDRSdNrraMSpZ8+DpmZciROwgEgabOtSiHwfKbXMI=; b=pvFF0keYAJxpRjTHEXoBc+AZLX0VRgjho3bTHqGYVXIbVSTHacPoz+BQXjnM1UC2ZJ 51RMYZnQdNFtP4u51deW1THXJ33EK/kzzwScMX8Elh2SD3iG0xxmm2ist2iM3Tae1H+5 8seI8z4ndKDKQ7YmKOL1XTNtY8p91zrQYfDN0YLfUF+MS9D8ZSM6eflSuPG7AlqnMRE4 QvdVnrpn5tKlvrW8c0Kqu2qQBOT058Vot40doRvP6w0FciBSQiznP7+rXCI7cveba9Yr Nn+7x5ElqEWE/1ZdkH4WLWp9ZmXQVluV6M4rGBJjfe2uic3uEbeud/onJNx12Qpvk2+9 /n4Q== Received: by 10.180.80.9 with SMTP id n9mr719155wix.4.1331846018374; Thu, 15 Mar 2012 14:13:38 -0700 (PDT) Received: from localhost.localdomain ([95.35.0.236]) by mx.google.com with ESMTPS id ff9sm8091314wib.2.2012.03.15.14.13.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Mar 2012 14:13:37 -0700 (PDT) From: Dmitry Fleytman To: qemu-devel@nongnu.org Date: Thu, 15 Mar 2012 23:09:08 +0200 Message-Id: <1331845748-6026-10-git-send-email-dmitry.fleytman@ravellosystems.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1331845748-6026-1-git-send-email-dmitry.fleytman@ravellosystems.com> References: <1331845748-6026-1-git-send-email-dmitry.fleytman@ravellosystems.com> X-Gm-Message-State: ALoCoQngoLOLBgENi17pq2sE7TsUgygFL8PPrQ8wzp5MWF9fwvjRaMuPfBb8x4Qtw1snPulFm7sc X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 74.125.245.90 Cc: Anthony Liguori , Alex Fishman , Dmitry Fleytman , yvugenfi@redhat.com, Izik Eidus , Yan Vugenfirer , "Michael S. Tsirkin" , Dmitry Fleytman Subject: [Qemu-devel] [PATCH v4 9/9] VMXNET3 paravirtualized device integration. Interface type "vmxnet3" added. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Dmitry Fleytman Signed-off-by: Yan Vugenfirer --- Makefile.objs | 1 + default-configs/pci.mak | 1 + hw/pci.c | 2 ++ hw/pci.h | 1 + net.c | 2 +- 5 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 226b01d..1366e86 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -284,6 +284,7 @@ hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o hw-obj-$(CONFIG_PCNET_COMMON) += pcnet.o hw-obj-$(CONFIG_E1000_PCI) += e1000.o hw-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o +hw-obj-$(CONFIG_VMXNET3_PCI) += vmxnet3.o vmxnet_utils.o vmxnet_pkt.o hw-obj-$(CONFIG_SMC91C111) += smc91c111.o hw-obj-$(CONFIG_LAN9118) += lan9118.o diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 21e4ccf..f8e6ee1 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -13,6 +13,7 @@ CONFIG_PCNET_COMMON=y CONFIG_LSI_SCSI_PCI=y CONFIG_RTL8139_PCI=y CONFIG_E1000_PCI=y +CONFIG_VMXNET3_PCI=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y diff --git a/hw/pci.c b/hw/pci.c index 9146d3f..e2b0045 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1355,6 +1355,7 @@ static const char * const pci_nic_models[] = { "e1000", "pcnet", "virtio", + "vmxnet3", NULL }; @@ -1367,6 +1368,7 @@ static const char * const pci_nic_names[] = { "e1000", "pcnet", "virtio-net-pci", + "vmxnet3", NULL }; diff --git a/hw/pci.h b/hw/pci.h index 4f19fdb..fee8250 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -60,6 +60,7 @@ #define PCI_DEVICE_ID_VMWARE_NET 0x0720 #define PCI_DEVICE_ID_VMWARE_SCSI 0x0730 #define PCI_DEVICE_ID_VMWARE_IDE 0x1729 +#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 /* Intel (0x8086) */ #define PCI_DEVICE_ID_INTEL_82551IT 0x1209 diff --git a/net.c b/net.c index c34474f..e2f586c 100644 --- a/net.c +++ b/net.c @@ -857,7 +857,7 @@ static const struct { }, { .name = "model", .type = QEMU_OPT_STRING, - .help = "device model (e1000, rtl8139, virtio etc.)", + .help = "device model (e1000, rtl8139, virtio, vmxnet3 etc.)", }, { .name = "addr", .type = QEMU_OPT_STRING,