From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N7uFK-0000Do-1e
	for qemu-devel@nongnu.org; Tue, 10 Nov 2009 12:11:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N7uFF-00008r-Pt
	for qemu-devel@nongnu.org; Tue, 10 Nov 2009 12:11:09 -0500
Received: from [199.232.76.173] (port=41061 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N7uFF-00008N-Eb
	for qemu-devel@nongnu.org; Tue, 10 Nov 2009 12:11:05 -0500
Received: from mx1.redhat.com ([209.132.183.28]:7102)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <markmc@redhat.com>) id 1N7uFF-00041k-0P
	for qemu-devel@nongnu.org; Tue, 10 Nov 2009 12:11:05 -0500
Received: from int-mx04.intmail.prod.int.phx2.redhat.com
	(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAAHB4LV031785
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Tue, 10 Nov 2009 12:11:04 -0500
From: Mark McLoughlin <markmc@redhat.com>
In-Reply-To: <m3eio648ik.fsf@neno.mitica>
References: <1257519486-14786-1-git-send-email-quintela@redhat.com>
	<1257871679.2888.71.camel@blaa>  <m3eio648ik.fsf@neno.mitica>
Content-Type: text/plain
Date: Tue, 10 Nov 2009 17:08:36 +0000
Message-Id: <1257872916.2888.72.camel@blaa>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] Fix incoming migration
Reply-To: Mark McLoughlin <markmc@redhat.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Juan Quintela <quintela@redhat.com>
Cc: qemu-devel@nongnu.org

On Tue, 2009-11-10 at 18:03 +0100, Juan Quintela wrote:
> Mark McLoughlin <markmc@redhat.com> wrote:
> > On Fri, 2009-11-06 at 15:58 +0100, Juan Quintela wrote:
> >> commit b04c4134d6de28c249277de19e523bfbe4aebbd6
> >> broke incoming migration.  After talking with Gleb, code was intended
> >> to be the way is in this fix.  This fixes migration here.
> >
> > Tried to reproduce and it works fine for me. More details?
> >
> >> Signed-off-by: Juan Quintela <quintela@redhat.com>
> >> ---
> >>  savevm.c |    7 ++++++-
> >>  1 files changed, 6 insertions(+), 1 deletions(-)
> >> 
> >> diff --git a/savevm.c b/savevm.c
> >> index b7abf43..fd98ccd 100644
> >> --- a/savevm.c
> >> +++ b/savevm.c
> >> @@ -126,6 +126,8 @@ static int announce_self_create(uint8_t *buf,
> >>  static void qemu_announce_self_once(void *opaque)
> >>  {
> >>      int i, len;
> >> +    VLANState *vlan;
> >> +    VLANClientState *vc;
> >>      uint8_t buf[60];
> >>      static int count = SELF_ANNOUNCE_ROUNDS;
> >>      QEMUTimer *timer = *(QEMUTimer **)opaque;
> >> @@ -134,7 +136,10 @@ static void qemu_announce_self_once(void *opaque)
> >>          if (!nd_table[i].used)
> >>              continue;
> >>          len = announce_self_create(buf, nd_table[i].macaddr);
> >> -        qemu_send_packet_raw(nd_table[i].vc, buf, len);
> >> +        vlan = nd_table[i].vlan;
> >> +        QTAILQ_FOREACH(vc, &vlan->clients, next) {
> >> +            qemu_send_packet_raw(vc, buf, len);
> >> +        }
> >
> > A NIC isn't necessarily connected to a vlan any more, which is why the
> > change was made.
> >
> > With your patch, I'd expect it to crash if you used -netdev rather than
> > -net
> 
> Without this patch, migration don't work at all.  nd_table[i].vc is NULL
> at this point.  Any better idea?

Right, I can't reproduce that. Exactly what command line did you use?

Thanks,
Mark.