From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36281)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XS3an-000102-SG
	for qemu-devel@nongnu.org; Thu, 11 Sep 2014 08:35:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1XS3ah-0007uo-Rr
	for qemu-devel@nongnu.org; Thu, 11 Sep 2014 08:35:17 -0400
Date: Thu, 11 Sep 2014 15:38:25 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140911123825.GB25518@redhat.com>
References: <1409848699-28374-1-git-send-email-stefanha@redhat.com>
	<1409848699-28374-4-git-send-email-stefanha@redhat.com>
	<5411935E.7020402@de.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5411935E.7020402@de.ibm.com>
Subject: Re: [Qemu-devel] [PULL 3/6] virtio: don't call device on !vm_running
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, qemu-stable@nongnu.org

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" <mst@redhat.com>
> > 
> > On vm stop, virtio changes vm_running state
> > too soon, so callbacks can get envoked with
> > vm_running = false;
> > 
> > Cc: qemu-stable@nongnu.org
> > Cc: Jason Wang <jasowang@redhat.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > Signed-off-by: Stefan Hajnoczi <stefanha@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?