From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCuV7-00061x-Ea for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:59:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCuV1-0001Sj-Dg for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:59:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCuV1-0001Sf-86 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:59:47 -0400 Date: Tue, 14 Jun 2016 22:59:45 +0300 From: "Michael S. Tsirkin" Message-ID: <20160614225945-mutt-send-email-mst@redhat.com> References: <1465934227-16558-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1465934227-16558-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 09/32] vhost-net: save & restore vring enable state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Yuanhan Liu , Victor Kaplansky , Jason Wang From: Marc-Andr=E9 Lureau A driver may change the vring enable state at run time but vhost-user backend may not be present (a contrived example is when the backend is disconnected and the device is reconfigured after driver rebinding) Restore the vring state when the vhost-user backend is started, so it can process the ring. Signed-off-by: Marc-Andr=E9 Lureau Tested-by: Yuanhan Liu Reviewed-by: Yuanhan Liu Reviewed-by: Victor Kaplansky Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/net/net.h | 1 + hw/net/vhost_net.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/net/net.h b/include/net/net.h index a69e382..a5c5095 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -99,6 +99,7 @@ struct NetClientState { NetClientDestructor *destructor; unsigned int queue_index; unsigned rxfilter_notify_enabled:1; + int vring_enable; QTAILQ_HEAD(NetFilterHead, NetFilterState) filters; }; =20 diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index b28881f..50f4dcd 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -329,6 +329,15 @@ int vhost_net_start(VirtIODevice *dev, NetClientStat= e *ncs, if (r < 0) { goto err_start; } + + if (ncs[i].peer->vring_enable) { + /* restore vring enable state */ + r =3D vhost_set_vring_enable(ncs[i].peer, ncs[i].peer->vring= _enable); + + if (r < 0) { + goto err_start; + } + } } =20 return 0; @@ -422,6 +431,8 @@ int vhost_set_vring_enable(NetClientState *nc, int en= able) VHostNetState *net =3D get_vhost_net(nc); const VhostOps *vhost_ops; =20 + nc->vring_enable =3D enable; + if (!net) { return 0; } --=20 MST