From patchwork Tue Mar 13 08:56:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 146368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6F5EFB6F62 for ; Tue, 13 Mar 2012 20:01:57 +1100 (EST) Received: from localhost ([::1]:33439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Nc9-00081S-Ar for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2012 05:01:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Nbs-0007kN-Uo for qemu-devel@nongnu.org; Tue, 13 Mar 2012 05:01:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7NbQ-0007g2-Ol for qemu-devel@nongnu.org; Tue, 13 Mar 2012 05:01:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7NbQ-0007ff-Hn for qemu-devel@nongnu.org; Tue, 13 Mar 2012 05:01:08 -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.14.4/8.14.4) with ESMTP id q2D915Pe009927 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Mar 2012 05:01:05 -0400 Received: from amd-6168-8-1.englab.nay.redhat.com (amd-6168-8-1.englab.nay.redhat.com [10.66.104.52]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q2D912w1023671; Tue, 13 Mar 2012 05:01:03 -0400 To: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, mst@redhat.com, rusty@rustcorp.com.au, qemu-devel@nongnu.org, quintela@redhat.com From: Jason Wang Date: Tue, 13 Mar 2012 16:56:31 +0800 Message-ID: <20120313085631.10958.53341.stgit@amd-6168-8-1.englab.nay.redhat.com> In-Reply-To: <20120313085500.10958.92659.stgit@amd-6168-8-1.englab.nay.redhat.com> References: <20120313085500.10958.92659.stgit@amd-6168-8-1.englab.nay.redhat.com> User-Agent: StGit/0.16-1-g60c4 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [V4 PATCH 3/5] net: model specific announcing support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 82b9d3a..0a901dc 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 == NULL || func(&nic->nc) != 0) { + len = announce_self_create(buf, nic->conf->macaddr.a); + qemu_send_packet_raw(&nic->nc, buf, len); + } }