From: Michael S. Tsirkin <mst@redhat.com>
Date: Wed, 2 Jun 2010 08:40:54 +0000 (+0300)
Subject: virtio-net: stop vhost backend on vmstop
X-Git-Tag: v0.13.0-rc0~315^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f9744812291853425b614f68668f48d49882a1f;p=thirdparty%2Fqemu.git

virtio-net: stop vhost backend on vmstop

vhost net currently keeps running after vmstop,
which causes trouble as qemy does not check
for dirty pages anymore.
The fix is to simply keep vm and vhost running/stopped
status in sync.

Tested-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index cb664e62072..6a9d560a9b1 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -877,12 +877,11 @@ static void virtio_net_set_status(struct VirtIODevice *vdev, uint8_t status)
 static void virtio_net_vmstate_change(void *opaque, int running, int reason)
 {
     VirtIONet *n = opaque;
-    if (!running) {
-        return;
-    }
-    /* This is called when vm is started, it will start vhost backend if
-     * appropriate e.g. after migration. */
-    virtio_net_set_status(&n->vdev, n->vdev.status);
+    uint8_t status = running ? VIRTIO_CONFIG_S_DRIVER_OK : 0;
+    /* This is called when vm is started/stopped,
+     * it will start/stop vhost backend if * appropriate
+     * e.g. after migration. */
+    virtio_net_set_status(&n->vdev, n->vdev.status & status);
 }
 
 VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf)