diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-08-05 08:01:48 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-08-05 08:01:48 -0500 |
| commit | 59a88774d912bb53795daa2d3620707401aea077 (patch) | |
| tree | 348bf52920ebccf8cd32b0bbd668c2c57269a4f4 /hw | |
| parent | 56105bd5c0b6d7ac62b34c8b8f496df8f7bd9d92 (diff) | |
| parent | ee76c1f821e75550644e084dea85743bbc934f91 (diff) | |
| download | qemu-59a88774d912bb53795daa2d3620707401aea077.zip qemu-59a88774d912bb53795daa2d3620707401aea077.tar.gz qemu-59a88774d912bb53795daa2d3620707401aea077.tar.bz2 | |
Merge remote-tracking branch 'stefanha/net' into staging
# By Jan Kiszka
# Via Stefan Hajnoczi
* stefanha/net:
pcnet: Flush queued packets on end of STOP state
Message-id: 1375704975-19128-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/pcnet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index b606d2b..63aa73a 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -861,6 +861,8 @@ static void pcnet_init(PCNetState *s) s->csr[0] |= 0x0101; s->csr[0] &= ~0x0004; /* clear STOP bit */ + + qemu_flush_queued_packets(qemu_get_queue(s->nic)); } static void pcnet_start(PCNetState *s) @@ -878,6 +880,8 @@ static void pcnet_start(PCNetState *s) s->csr[0] &= ~0x0004; /* clear STOP bit */ s->csr[0] |= 0x0002; pcnet_poll_timer(s); + + qemu_flush_queued_packets(qemu_get_queue(s->nic)); } static void pcnet_stop(PCNetState *s) |