From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59927)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mlureau@redhat.com>) id 1Zi0np-00027c-Cb
	for qemu-devel@nongnu.org; Fri, 02 Oct 2015 09:55:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mlureau@redhat.com>) id 1Zi0nl-0006d6-Q2
	for qemu-devel@nongnu.org; Fri, 02 Oct 2015 09:55:13 -0400
Received: from mx6-phx2.redhat.com ([209.132.183.39]:33847)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mlureau@redhat.com>) id 1Zi0nl-0006bD-GU
	for qemu-devel@nongnu.org; Fri, 02 Oct 2015 09:55:09 -0400
Date: Fri, 2 Oct 2015 09:55:01 -0400 (EDT)
From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau <mlureau@redhat.com>
Message-ID: <922876804.23114504.1443794101158.JavaMail.zimbra@redhat.com>
In-Reply-To: <20151002163639-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>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v7 16/24] vhost user: add rarp sending
 after live migration for legacy guest
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: "Michael S. Tsirkin" <mst@redhat.com>
Cc: haifeng lin <haifeng.lin@huawei.com>, thibaut collet <thibaut.collet@6wind.com>, jasowang@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com, marcandre lureau <marcandre.lureau@redhat.com>



----- 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);
> >  }
> >  
> > +int vhost_net_notify_migration_done(struct vhost_net *net, char* mac_addr)
> > +{
> > +    const VhostOps *vhost_ops = net->dev.vhost_ops;
> > +    int r = -1;
> > +
> > +    if (vhost_ops->vhost_migration_done) {
> > +        r = 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 *net,
> > VirtIODevice *dev,
> >  {
> >  }
> >  
> > +int vhost_net_notify_migration_done(struct vhost_net *net)
> > +{
> > +    return -1;
> > +}
> > +
> >  VHostNetState *get_vhost_net(NetClientState *nc)
> >  {
> >      return 0;
> 
> This signature does not fit the one above.
> How was this tested?
> 

Good question, I totally missed that. It has been there since Thibaut v6 series.

I guess we all compile with CONFIG_VHOST_NET, and adding the missing char* mac_addr is enough to fix this.