From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8T0m-0007qc-7V for qemu-devel@nongnu.org; Fri, 16 Mar 2012 04:59:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8T0f-0002y9-D8 for qemu-devel@nongnu.org; Fri, 16 Mar 2012 04:59:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8T0f-0002xZ-4r for qemu-devel@nongnu.org; Fri, 16 Mar 2012 04:59:41 -0400 From: Jason Wang Date: Fri, 16 Mar 2012 16:55:02 +0800 Message-ID: <20120316085502.4947.28825.stgit@amd-6168-8-1.englab.nay.redhat.com> In-Reply-To: <20120316085237.4947.53556.stgit@amd-6168-8-1.englab.nay.redhat.com> References: <20120316085237.4947.53556.stgit@amd-6168-8-1.englab.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [V5 PATCH 2/4] net: model specific announcing support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, mst@redhat.com, rusty@rustcorp.com.au, qemu-devel@nongnu.org, quintela@redhat.com, pbonzini@redhat.com This patch introduces a function pointer in NetClientInfo which is called during self announcement. With this, each kind of card can announce the link with a specific way. The old method is still kept for cards that have not implemented this or old guest. The first user would be virtio-net. Signed-off-by: Jason Wang --- net.h | 2 ++ savevm.c | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/net.h b/net.h index 75a8c15..7195bfc 100644 --- a/net.h +++ b/net.h @@ -48,6 +48,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 int (NetAnnounce)(VLANClientState *); typedef struct NetClientInfo { net_client_type type; @@ -59,6 +60,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 80be1ff..7558c1d 100644 --- a/savevm.c +++ b/savevm.c @@ -123,10 +123,12 @@ 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); - - qemu_send_packet_raw(&nic->nc, buf, len); + if (!func || func(&nic->nc) != 0) { + len = announce_self_create(buf, nic->conf->macaddr.a); + qemu_send_packet_raw(&nic->nc, buf, len); + } }