On Thu, Sep 11, 2014 at 02:19:42PM +0200, Christian Borntraeger wrote:
> On 04/09/14 18:38, Stefan Hajnoczi wrote:
> > From: "Michael S. Tsirkin" <m...@redhat.com>
> >
> > On vm stop, virtio changes vm_running state
> > too soon, so callbacks can get envoked with
> > vm_running = false;
> >
> > Cc: qemu-sta...@nongnu.org
> > Cc: Jason Wang <jasow...@redhat.com>
> > Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
> > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
> > ---
> > hw/virtio/virtio.c | 9 ++++++++-
> > 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> > index 5c98180..ac22238 100644
> > --- a/hw/virtio/virtio.c
> > +++ b/hw/virtio/virtio.c
> > @@ -1108,7 +1108,10 @@ static void virtio_vmstate_change(void *opaque, int
> > running, RunState state)
> > BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
> > VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> > bool backend_run = running && (vdev->status &
> > VIRTIO_CONFIG_S_DRIVER_OK);
> > - vdev->vm_running = running;
> > +
> > + if (running) {
> > + vdev->vm_running = running;
> > + }
> >
> > if (backend_run) {
> > virtio_set_status(vdev, vdev->status);
> > @@ -1121,6 +1124,10 @@ static void virtio_vmstate_change(void *opaque, int
> > running, RunState state)
> > if (!backend_run) {
> > virtio_set_status(vdev, vdev->status);
> > }
> > +
> > + if (!running) {
> > + vdev->vm_running = running;
> > + }
> > }
> >
> > void virtio_init(VirtIODevice *vdev, const char *name,
> >
>
>
> This broke managedsave on s390x:
> qemu-system-s390x: hw/net/virtio-net.c:1348: virtio_net_save: Assertion
> `!n->vhost_started' failed.
> reverting that commit makes it working again.
> Any ideas?
>
> Christian
Does it help if you apply
[PULL v2 09/16] vhost_net: cleanup start/stop condition
on top?
