From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9ow-0000kZ-32 for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:59:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQ9ov-0007Zc-8E for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:59:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9ov-0007ZY-2y for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:59:05 -0400 From: marcandre.lureau@redhat.com Date: Thu, 21 Jul 2016 12:57:40 +0400 Message-Id: <20160721085750.30008-22-marcandre.lureau@redhat.com> In-Reply-To: <20160721085750.30008-1-marcandre.lureau@redhat.com> References: <20160721085750.30008-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 21/31] vhost: add assert() to check runtime behaviour List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mukawa@igel.co.jp, yuanhan.liu@linux.intel.com, victork@redhat.com, jonshin@cisco.com, mst@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau All these functions must be called only after the backend is connected. They are called from virtio-net.c, after either virtio or link status change. The check for nc->peer->link_down should ensure vhost_net_{start,stop}() are always called between vhost_user_{start,stop}(). Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/vhost.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 09428bc..970261b 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1242,6 +1242,9 @@ void vhost_virtqueue_mask(struct vhost_dev *hdev, V= irtIODevice *vdev, int n, int r, index =3D n - hdev->vq_index; struct vhost_vring_file file; =20 + /* should only be called after backend is connected */ + assert(hdev->vhost_ops); + if (mask) { assert(vdev->use_guest_notifier_mask); file.fd =3D event_notifier_get_fd(&hdev->vqs[index].masked_notif= ier); @@ -1288,6 +1291,9 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIOD= evice *vdev) { int i, r; =20 + /* should only be called after backend is connected */ + assert(hdev->vhost_ops); + hdev->started =3D true; =20 r =3D vhost_dev_set_features(hdev, hdev->log_enabled); @@ -1350,6 +1356,9 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIOD= evice *vdev) { int i; =20 + /* should only be called after backend is connected */ + assert(hdev->vhost_ops); + for (i =3D 0; i < hdev->nvqs; ++i) { vhost_virtqueue_stop(hdev, vdev, --=20 2.9.0