From patchwork Mon Sep 27 12:51:01 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jason Wang <jasowang@redhat.com>
X-Patchwork-Id: 212122
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8RCpHVV016639
	for <patchwork-kvm@patchwork.kernel.org>;
	Mon, 27 Sep 2010 12:51:17 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932731Ab0I0MvN (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Mon, 27 Sep 2010 08:51:13 -0400
Received: from mx1.redhat.com ([209.132.183.28]:17036 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932656Ab0I0MvN (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 27 Sep 2010 08:51:13 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8RCpBgB026221
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Mon, 27 Sep 2010 08:51:11 -0400
Received: from dhcp-91-7.nay.redhat.com.englab.nay.redhat.com
	(dhcp-91-7.nay.redhat.com [10.66.91.7])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o8RCp8Lx032281; Mon, 27 Sep 2010 08:51:09 -0400
Subject: [RFC PATCH 2/4] net: Introduce model specific nic announce function
To: qemu-devel@nongnu.org, anthony@codemonkey.ws, mst@redhat.com
From: Jason Wang <jasowang@redhat.com>
Cc: kvm@vger.kernel.org
Date: Mon, 27 Sep 2010 20:51:01 +0800
Message-ID: 
 <20100927125101.12060.53223.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com>
In-Reply-To: 
 <20100927124606.12060.66912.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com>
References: 
 <20100927124606.12060.66912.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com>
User-Agent: StGit/0.15
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Mon, 27 Sep 2010 12:51:17 +0000 (UTC)


diff --git a/net.h b/net.h
index e3f643c..4fa5603 100644
--- a/net.h
+++ b/net.h
@@ -42,6 +42,7 @@ typedef ssize_t (NetReceive)(VLANClientState *, const uint8_t *, size_t);
 typedef ssize_t (NetReceiveIOV)(VLANClientState *, const struct iovec *, int);
 typedef void (NetCleanup) (VLANClientState *);
 typedef void (LinkStatusChanged)(VLANClientState *);
+typedef void (NetAnnounce)(VLANClientState *);
 
 typedef struct NetClientInfo {
     net_client_type type;
@@ -53,6 +54,7 @@ typedef struct NetClientInfo {
     NetCleanup *cleanup;
     LinkStatusChanged *link_status_changed;
     NetPoll *poll;
+    NetAnnounce *announce;
 } NetClientInfo;
 
 struct VLANClientState {
diff --git a/savevm.c b/savevm.c
index 545d511..c16ee1b 100644
--- a/savevm.c
+++ b/savevm.c
@@ -90,10 +90,16 @@ static void qemu_announce_self_iter(NICState *nic, void *opaque)
 {
     uint8_t buf[60];
     int len;
+    NetAnnounce *func = nic->nc.info->announce;
 
-    len = announce_self_create(buf, nic->conf->macaddr.a);
+    if (func == NULL) {
+        len = announce_self_create(buf, nic->conf->macaddr.a);
 
-    qemu_send_packet_raw(&nic->nc, buf, len);
+        qemu_send_packet_raw(&nic->nc, buf, len);
+    }
+    else {
+        func(&nic->nc);
+    }
 }