From patchwork Wed Jun 2 08:44:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: virtio-net: stop vhost backend on vmstop Date: Tue, 01 Jun 2010 22:44:24 -0000 From: Michael S. Tsirkin X-Patchwork-Id: 54350 Message-Id: <20100602084424.GA19574@redhat.com> To: qemu-devel@nongnu.org, Anthony Liguori , dlstevens@us.ibm.com Cc: vhost net currently keep 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 Signed-off-by: Michael S. Tsirkin --- hw/virtio-net.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index cb664e6..6a9d560 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)