Commit e8bcf842 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Stefan Hajnoczi
Browse files

virtio-net: don't run bh on vm stopped 



commit 783e7706
    virtio-net: stop/start bh when appropriate

is incomplete: BH might execute within the same main loop iteration but
after vmstop, so in theory, we might trigger an assertion.
I was unable to reproduce this in practice,
but it seems clear enough that the potential is there, so worth fixing.

Cc: qemu-stable@nongnu.org
Reported-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent e1d64c08

hw/net/virtio-net.c

+12 −2
Original line number Diff line number Diff line
@@ -1224,7 +1224,12 @@ static void virtio_net_tx_timer(void *opaque) 
    VirtIONetQueue *q = opaque;

    VirtIONet *n = q->n;

    VirtIODevice *vdev = VIRTIO_DEVICE(n);

    assert(vdev->vm_running);

    /* This happens when device was stopped but BH wasn't. */

    if (!vdev->vm_running) {

        /* Make sure tx waiting is set, so we'll run when restarted. */

        assert(q->tx_waiting);

        return;

    }



    q->tx_waiting = 0;
@@ -1244,7 +1249,12 @@ static void virtio_net_tx_bh(void *opaque) 
    VirtIODevice *vdev = VIRTIO_DEVICE(n);

    int32_t ret;



    assert(vdev->vm_running);

    /* This happens when device was stopped but BH wasn't. */

    if (!vdev->vm_running) {

        /* Make sure tx waiting is set, so we'll run when restarted. */

        assert(q->tx_waiting);

        return;

    }



    q->tx_waiting = 0;