Commit c7e1f823 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Tue 28 Nov 2017 03:58:11 GMT
# gpg:                using RSA key 0xEF04965B398D6211
# 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:
  virtio-net: don't touch virtqueue if vm is stopped

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5e19aed5 70e53e6e

hw/net/virtio-net.c

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ static void virtio_net_set_status(struct VirtIODevice *vdev, uint8_t status) 
                qemu_bh_cancel(q->tx_bh);

            }

            if ((n->status & VIRTIO_NET_S_LINK_UP) == 0 &&

                (queue_status & VIRTIO_CONFIG_S_DRIVER_OK)) {

                (queue_status & VIRTIO_CONFIG_S_DRIVER_OK) &&

                vdev->vm_running) {

                /* if tx is waiting we are likely have some packets in tx queue

                 * and disabled notification */

                q->tx_waiting = 0;