From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIF-0006KJ-Cq for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyID-00038u-0k for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIC-00038q-Rg for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:56 -0400 Date: Fri, 29 Jul 2016 06:16:53 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-32-git-send-email-mst@redhat.com> References: <1469762011-7902-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: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 31/41] vhost-net: vhost_migration_done is vhost-user specific 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 , Jason Wang From: Marc-Andr=E9 Lureau Either the callback is mandatory to implement, in which case an assert() is more appropriate, or it's not and we can't tell much whether the function should fail or not (given it's name, I guess it should silently success by default). Instead, make the implementation mandatory and vhost-user specific to be more clear about its usage. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/vhost_net.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 54cf015..dd41a8e 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -383,13 +383,11 @@ void vhost_net_cleanup(struct vhost_net *net) int vhost_net_notify_migration_done(struct vhost_net *net, char* mac_add= r) { const VhostOps *vhost_ops =3D net->dev.vhost_ops; - int r =3D -1; =20 - if (vhost_ops->vhost_migration_done) { - r =3D vhost_ops->vhost_migration_done(&net->dev, mac_addr); - } + assert(vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); + assert(vhost_ops->vhost_migration_done); =20 - return r; + return vhost_ops->vhost_migration_done(&net->dev, mac_addr); } =20 bool vhost_net_virtqueue_pending(VHostNetState *net, int idx) --=20 MST