Commit d7108d90 authored by Jason Wang's avatar Jason Wang Committed by Anthony Liguori
Browse files

virtio-net: properly check the vhost status during status set 



Commit 32993698 (vhost: disable on tap link down) tries to disable the vhost
also when the peer's link is down. But the check was not done properly, the
vhost were only started when:

1) peer's link is not down
2) virtio-net has already been started.

Since == have a higher precedence than &&, place a brace to make sure both the
conditions were met then does the check. This fixes the crash when doing a savem
after set the link off which let qemu crash and complains:

virtio_net_save: Assertion `!n->vhost_started' failed.

Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Message-id: 1366972060-21606-1-git-send-email-jasowang@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent fd8192a5

hw/net/virtio-net.c

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status) 
        return;

    }



    if (!!n->vhost_started == virtio_net_started(n, status) &&

                              !nc->peer->link_down) {

    if (!!n->vhost_started ==

        (virtio_net_started(n, status) && !nc->peer->link_down)) {

        return;

    }

    if (!n->vhost_started) {