diff options
| author | Anthony Liguori | 2013-09-11 21:45:18 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-09-11 21:45:18 +0200 |
| commit | ce2b69417caae3731fb50f67854afa006f624a2d (patch) | |
| tree | b0e2c2f1c869f50dd0a6c35bbd8b7a62c7cef3b5 /include | |
| parent | Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging (diff) | |
| parent | ne2000: mark I/O as LITTLE_ENDIAN (diff) | |
| download | qemu-ce2b69417caae3731fb50f67854afa006f624a2d.tar.gz qemu-ce2b69417caae3731fb50f67854afa006f624a2d.tar.xz qemu-ce2b69417caae3731fb50f67854afa006f624a2d.zip | |
Merge remote-tracking branch 'stefanha/net' into staging
# By Brad Smith (2) and others
# Via Stefan Hajnoczi
* stefanha/net:
ne2000: mark I/O as LITTLE_ENDIAN
vmxnet3: Eliminate __packed redefined warning
e1000: add interrupt mitigation support
net: Rename send_queue to incoming_queue
tap: Use numbered tap/tun devices on all *BSD OS's
Message-id: 1378481624-20964-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 8 | ||||
| -rw-r--r-- | include/net/net.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 7fb04d8cd8..9b2ddc4acc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -225,7 +225,15 @@ void pvpanic_init(ISABus *bus); int e820_add_entry(uint64_t, uint64_t, uint32_t); +#define PC_COMPAT_1_6 \ + {\ + .driver = "e1000",\ + .property = "mitigation",\ + .value = "off",\ + } + #define PC_COMPAT_1_5 \ + PC_COMPAT_1_6, \ {\ .driver = "Conroe-" TYPE_X86_CPU,\ .property = "model",\ diff --git a/include/net/net.h b/include/net/net.h index 30e4b04066..11e146888b 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -69,7 +69,7 @@ struct NetClientState { int link_down; QTAILQ_ENTRY(NetClientState) next; NetClientState *peer; - NetQueue *send_queue; + NetQueue *incoming_queue; char *model; char *name; char info_str[256]; |