diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-12-07 14:18:31 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-12-07 14:18:31 +0000 |
| commit | 84942979de3b7204ff53dbd263f8919897c779b2 (patch) | |
| tree | ebd67f78398cc5cf0a04f5854f483a3bdd25e9b2 /hw/net/e1000.c | |
| parent | a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c (diff) | |
| parent | 52b4bb7383b32e4e7512f98c57738c8fc9cb35ba (diff) | |
| download | qemu-84942979de3b7204ff53dbd263f8919897c779b2.tar.gz qemu-84942979de3b7204ff53dbd263f8919897c779b2.tar.bz2 qemu-84942979de3b7204ff53dbd263f8919897c779b2.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 07 Dec 2015 14:06:07 GMT using RSA key ID 398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
lan9118: log and ignore access to invalid registers, rather than aborting
lan9118: fix emulation of MAC address loaded bit in E2P_CMD register
vmxnet3: silence warning
pcnet: fix rx buffer overflow(CVE-2015-7512)
net: pcnet: add check to validate receive data size(CVE-2015-7504)
e1000: fix hang of win2k12 shutdown with flood ping
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/e1000.c')
| -rw-r--r-- | hw/net/e1000.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c index c877e06c5d..bec06e90ec 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -447,6 +447,11 @@ static void e1000_reset(void *opaque) e1000_link_down(d); } + /* Throttle interrupts to prevent guest (e.g Win 2012) from + * reinjecting interrupts endlessly. TODO: fix non ITR case. + */ + d->mac_reg[ITR] = 250; + /* Some guests expect pre-initialized RAH/RAL (AddrValid flag + MACaddr) */ d->mac_reg[RA] = 0; d->mac_reg[RA + 1] = E1000_RAH_AV; |