From: Michael S. Tsirkin <mst@redhat.com>
Date: Tue, 25 Dec 2012 15:38:59 +0000 (+0200)
Subject: virtio-net: set/clear vhost_started in reverse order
X-Git-Tag: v1.4.0-rc0~196^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1830b80ff29dbd9d149f7f3cb565a690b5d5994c;p=thirdparty%2Fqemu.git

virtio-net: set/clear vhost_started in reverse order

As vhost started is cleared last thing on stop,
set it first things on start. This makes it
possible to use vhost_started while start is in
progress which is used by follow-up patches.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 5d03b31c1b9..b756d57b1a7 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -126,12 +126,12 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status)
         if (!vhost_net_query(tap_get_vhost_net(n->nic->nc.peer), &n->vdev)) {
             return;
         }
+        n->vhost_started = 1;
         r = vhost_net_start(tap_get_vhost_net(n->nic->nc.peer), &n->vdev);
         if (r < 0) {
             error_report("unable to start vhost net: %d: "
                          "falling back on userspace virtio", -r);
-        } else {
-            n->vhost_started = 1;
+            n->vhost_started = 0;
         }
     } else {
         vhost_net_stop(tap_get_vhost_net(n->nic->nc.peer), &n->vdev);