qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	Dmitry Fleytman <dmitry@daynix.com>,
	Jason Wang <jasowang@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PULL 5/6] vmxnet3: add boot rom
Date: Wed, 29 Jun 2016 12:05:03 +0200	[thread overview]
Message-ID: <1467194704-28047-6-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1467194704-28047-1-git-send-email-kraxel@redhat.com>

Disable for old machine types as this is a guest visible change.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/net/vmxnet3.c     | 1 +
 include/hw/i386/pc.h | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index d978976..25cee9f 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -2700,6 +2700,7 @@ static void vmxnet3_class_init(ObjectClass *class, void *data)
     c->vendor_id = PCI_VENDOR_ID_VMWARE;
     c->device_id = PCI_DEVICE_ID_VMWARE_VMXNET3;
     c->revision = PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION;
+    c->romfile = "efi-vmxnet3.rom";
     c->class_id = PCI_CLASS_NETWORK_ETHERNET;
     c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE;
     c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 49566c8..a112efb 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -362,6 +362,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
         .driver   = TYPE_X86_CPU,\
         .property = "cpuid-0xb",\
         .value    = "off",\
+    },{\
+        .driver   = "vmxnet3",\
+        .property = "romfile",\
+        .value    = "",\
     },
 
 #define PC_COMPAT_2_5 \
-- 
1.8.3.1

  parent reply	other threads:[~2016-06-29 10:05 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29 10:04 [Qemu-devel] [PULL 0/6] ipxe: update submodule from 4e03af8ec to 041863191 Gerd Hoffmann
2016-06-29 10:04 ` [Qemu-devel] [PULL 1/6] " Gerd Hoffmann
2016-06-29 10:05 ` [Qemu-devel] [PULL 2/6] ipxe: add e1000e rom Gerd Hoffmann
2016-06-29 10:05 ` [Qemu-devel] [PULL 3/6] ipxe: add vmxnet3 rom Gerd Hoffmann
2016-06-29 10:05 ` [Qemu-devel] [PULL 4/6] e1000e: add boot rom Gerd Hoffmann
2016-06-29 10:05 ` Gerd Hoffmann [this message]
2016-06-29 10:05 ` [Qemu-devel] [PULL 6/6] ipxe: update prebuilt binaries Gerd Hoffmann
2016-06-30  9:49 ` [Qemu-devel] [PULL 0/6] ipxe: update submodule from 4e03af8ec to 041863191 Peter Maydell
2016-06-30 16:21   ` Gerd Hoffmann
2016-06-30 16:37     ` Peter Maydell
2016-07-01  8:30       ` Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467194704-28047-6-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=dmitry@daynix.com \
    --cc=jasowang@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).