From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LhT81-0002zC-C0
	for qemu-devel@nongnu.org; Wed, 11 Mar 2009 14:26:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LhT7z-0002yv-Ps
	for qemu-devel@nongnu.org; Wed, 11 Mar 2009 14:26:04 -0400
Received: from [199.232.76.173] (port=46362 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LhT7z-0002yr-J6
	for qemu-devel@nongnu.org; Wed, 11 Mar 2009 14:26:03 -0400
Received: from mx2.redhat.com ([66.187.237.31]:46950)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mtosatti@redhat.com>) id 1LhT7z-000262-5K
	for qemu-devel@nongnu.org; Wed, 11 Mar 2009 14:26:03 -0400
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
	by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n2BIQ2vh027832
	for <qemu-devel@nongnu.org>; Wed, 11 Mar 2009 14:26:02 -0400
Date: Wed, 11 Mar 2009 15:25:03 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
Message-ID: <20090311182503.GA18711@amt.cnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] make qemu_announce_self handle non contiguous
	net tables
Reply-To: qemu-devel@nongnu.org
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: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>


With hotplug nd_table might contain holes.

Noticed by Eduardo Habkost.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: savevm.c
===================================================================
--- savevm.c	(revision 6811)
+++ savevm.c	(working copy)
@@ -122,7 +122,9 @@
     VLANClientState *vc;
     uint8_t buf[256];
 
-    for (i = 0; i < nb_nics; i++) {
+    for (i = 0; i < MAX_NICS; i++) {
+        if (!nd_table[i].used)
+            continue;
         len = announce_self_create(buf, nd_table[i].macaddr);
         vlan = nd_table[i].vlan;
         for(vc = vlan->first_client; vc != NULL; vc = vc->next) {