From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi0v1-0003Xm-TM for qemu-devel@nongnu.org; Fri, 02 Oct 2015 10:02:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zi0uw-0000l8-Tu for qemu-devel@nongnu.org; Fri, 02 Oct 2015 10:02:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi0uw-0000ky-PM for qemu-devel@nongnu.org; Fri, 02 Oct 2015 10:02:34 -0400 Date: Fri, 2 Oct 2015 17:02:29 +0300 From: "Michael S. Tsirkin" Message-ID: <20151002170146-mutt-send-email-mst@redhat.com> References: <1443720248-15482-1-git-send-email-marcandre.lureau@redhat.com> <1443720248-15482-17-git-send-email-marcandre.lureau@redhat.com> <20151002163639-mutt-send-email-mst@redhat.com> <922876804.23114504.1443794101158.JavaMail.zimbra@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <922876804.23114504.1443794101158.JavaMail.zimbra@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v7 16/24] vhost user: add rarp sending after live migration for legacy guest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Marc-Andr=E9?= Lureau Cc: haifeng lin , thibaut collet , jasowang@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, marcandre lureau On Fri, Oct 02, 2015 at 09:55:01AM -0400, Marc-Andr=E9 Lureau wrote: >=20 >=20 > ----- Original Message ----- > > On Thu, Oct 01, 2015 at 07:24:00PM +0200, marcandre.lureau@redhat.com= wrote: > > > diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c > > > index 840f443..da66b64 100644 > > > --- a/hw/net/vhost_net.c > > > +++ b/hw/net/vhost_net.c > > > @@ -388,6 +388,18 @@ void vhost_net_cleanup(struct vhost_net *net) > > > g_free(net); > > > } > > > =20 > > > +int vhost_net_notify_migration_done(struct vhost_net *net, char* m= ac_addr) > > > +{ > > > + const VhostOps *vhost_ops =3D net->dev.vhost_ops; > > > + int r =3D -1; > > > + > > > + if (vhost_ops->vhost_migration_done) { > > > + r =3D vhost_ops->vhost_migration_done(&net->dev, mac_addr)= ; > > > + } > > > + > > > + return r; > > > +} > > > + > > > bool vhost_net_virtqueue_pending(VHostNetState *net, int idx) > > > { > > > return vhost_virtqueue_pending(&net->dev, idx); > > > @@ -479,6 +491,11 @@ void vhost_net_virtqueue_mask(VHostNetState *n= et, > > > VirtIODevice *dev, > > > { > > > } > > > =20 > > > +int vhost_net_notify_migration_done(struct vhost_net *net) > > > +{ > > > + return -1; > > > +} > > > + > > > VHostNetState *get_vhost_net(NetClientState *nc) > > > { > > > return 0; > >=20 > > This signature does not fit the one above. > > How was this tested? > >=20 >=20 > Good question, I totally missed that. It has been there since Thibaut v= 6 series. >=20 > I guess we all compile with CONFIG_VHOST_NET, and adding the missing ch= ar* mac_addr is enough to fix this. You will catch this if you build and test all targets. --=20 MST