From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8VS2-0006ej-El for qemu-devel@nongnu.org; Fri, 16 Mar 2012 07:36:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8VS0-0001Df-ES for qemu-devel@nongnu.org; Fri, 16 Mar 2012 07:36:06 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:51423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8VS0-0001DM-57 for qemu-devel@nongnu.org; Fri, 16 Mar 2012 07:36:04 -0400 Received: by dadp14 with SMTP id p14so6121920dad.4 for ; Fri, 16 Mar 2012 04:36:02 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <4F63258E.4070502@redhat.com> Date: Fri, 16 Mar 2012 12:35:42 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1331845748-6026-1-git-send-email-dmitry.fleytman@ravellosystems.com> <1331845748-6026-10-git-send-email-dmitry.fleytman@ravellosystems.com> In-Reply-To: <1331845748-6026-10-git-send-email-dmitry.fleytman@ravellosystems.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 9/9] VMXNET3 paravirtualized device integration. Interface type "vmxnet3" added. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Dmitry Fleytman Cc: Anthony Liguori , Alex Fishman , "Michael S. Tsirkin" , yvugenfi@redhat.com, Izik Eidus , qemu-devel@nongnu.org, Dmitry Fleytman , Yan Vugenfirer Il 15/03/2012 22:09, Dmitry Fleytman ha scritto: > 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 These parts should be included in part 8. Paolo > 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,