diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-18 08:12:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-18 08:12:47 -0500 |
| commit | e9acb8cea9b11679cab8cb3c20c4348803bbb58a (patch) | |
| tree | af812486ea8acb10e00e06c70f1eaec31e18c0ef /include/hw/i386/pc.h | |
| parent | 6453a3a69488196f26d12654c6b148446abdf3d6 (diff) | |
| parent | d26d9e14c15837eba2b7447e8d15230bab8e0940 (diff) | |
| download | qemu-e9acb8cea9b11679cab8cb3c20c4348803bbb58a.zip qemu-e9acb8cea9b11679cab8cb3c20c4348803bbb58a.tar.gz qemu-e9acb8cea9b11679cab8cb3c20c4348803bbb58a.tar.bz2 | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
pci,net,pc enhancements
This includes some fixes and enhancements that accumulated in my tree:
pci fixes by dkoch, virtio-net enhancements by akong and mst,
and a fix for xen pc by mst.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 17 Jul 2013 04:44:45 AM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found
# By Don Koch (2) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
pc: don't access fw cfg if NULL
virtio-net: add feature bit for any header s/g
net: add support of mac-programming over macvtap in QEMU side
pci: fix BRDIGE typo
pci-bridge: update mappings for migration/restore
Message-id: 1374054430-21966-1-git-send-email-mst@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/hw/i386/pc.h')
| -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 61ff154..7fb97b0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -231,6 +231,10 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .driver = "Nehalem-" TYPE_X86_CPU,\ .property = "level",\ .value = stringify(2),\ + },{\ + .driver = "virtio-net-pci",\ + .property = "any_layout",\ + .value = "off",\ } #define PC_COMPAT_1_4 \ |