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 /include | |
| parent | 8662d7db392f906c7808014051b278ad1542db93 (diff) | |
| parent | 8df42d855c38a1b23b6ba9f38ab71b9d7fb24216 (diff) | |
| download | qemu-60a0f1af07d685c88f4ffa09370da5bd7514823e.zip | |
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 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 7e43b20b4b..fe5444dfb6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -374,6 +374,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 \ |