diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-05 12:46:18 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-05 12:46:18 +0100 |
| commit | 60a0f1af07d685c88f4ffa09370da5bd7514823e (patch) | |
| tree | 2c73fae058b5918d0dea6f48b7e7346d0168bced /hw | |
| parent | 8662d7db392f906c7808014051b278ad1542db93 (diff) | |
| parent | 8df42d855c38a1b23b6ba9f38ab71b9d7fb24216 (diff) | |
| download | qemu-60a0f1af07d685c88f4ffa09370da5bd7514823e.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20160704-1' into staging
ipxe: update submodule from 4e03af8ec to 041863191
e1000e+vmxnet3: add boot rom
# gpg: Signature made Mon 04 Jul 2016 07:25:46 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-ipxe-20160704-1:
build: add pc-bios to config-host.mak deps
ipxe: add new roms to BLOBS
ipxe: update prebuilt binaries
vmxnet3: add boot rom
e1000e: add boot rom
ipxe: add vmxnet3 rom
ipxe: add e1000e rom
ipxe: update submodule from 4e03af8ec to 041863191
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/e1000e.c | 1 | ||||
| -rw-r--r-- | hw/net/vmxnet3.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 692283fdd7..47787447cd 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -693,6 +693,7 @@ static void e1000e_class_init(ObjectClass *class, void *data) c->vendor_id = PCI_VENDOR_ID_INTEL; c->device_id = E1000_DEV_ID_82574L; c->revision = 0; + c->romfile = "efi-e1000e.rom"; c->class_id = PCI_CLASS_NETWORK_ETHERNET; c->is_express = 1; diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 92236d3919..b8e3b25053 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2719,6 +2719,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; |