From: Jason Wang <jasowang@redhat.com> To: qemu-devel@nongnu.org, anthony@codemonkey.ws, mst@redhat.com Cc: kvm@vger.kernel.org Subject: [RFC PATCH 2/4] net: Introduce model specific nic announce function Date: Mon, 27 Sep 2010 20:51:01 +0800 [thread overview] Message-ID: <20100927125101.12060.53223.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> (raw) In-Reply-To: <20100927124606.12060.66912.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> This patch introduce a function pointer in NetClientInfo which is called during self announcement to do the model specific mac address announcement. Previous method were kept for the model without its own implementation. Signed-off-by: Jason Wang <jasowang@redhat.com> --- net.h | 2 ++ savevm.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) 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); + } }
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com> To: qemu-devel@nongnu.org, anthony@codemonkey.ws, mst@redhat.com Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [RFC PATCH 2/4] net: Introduce model specific nic announce function Date: Mon, 27 Sep 2010 20:51:01 +0800 [thread overview] Message-ID: <20100927125101.12060.53223.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> (raw) In-Reply-To: <20100927124606.12060.66912.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> This patch introduce a function pointer in NetClientInfo which is called during self announcement to do the model specific mac address announcement. Previous method were kept for the model without its own implementation. Signed-off-by: Jason Wang <jasowang@redhat.com> --- net.h | 2 ++ savevm.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) 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); + } }
next prev parent reply other threads:[~2010-09-27 12:51 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-09-27 12:50 [RFC PATCH 0/4] Model specific function for nic announcement Jason Wang 2010-09-27 12:50 ` [Qemu-devel] " Jason Wang 2010-09-27 12:50 ` [RFC PATCH 1/4] net: move announce_self_create to net.c Jason Wang 2010-09-27 12:50 ` [Qemu-devel] " Jason Wang 2010-09-27 12:51 ` Jason Wang [this message] 2010-09-27 12:51 ` [Qemu-devel] [RFC PATCH 2/4] net: Introduce model specific nic announce function Jason Wang 2010-09-27 12:51 ` [RFC PATCH 3/4] virtio-net: Limit the num of uni/multicast mac addresses Jason Wang 2010-09-27 12:51 ` [Qemu-devel] " Jason Wang 2010-09-27 12:51 ` [RFC PATCH 4/4] virtio-net: implement virtio-net specific announce function Jason Wang 2010-09-27 12:51 ` [Qemu-devel] " Jason Wang 2010-09-27 14:25 ` [RFC PATCH 0/4] Model specific function for nic announcement Michael S. Tsirkin 2010-09-27 14:25 ` [Qemu-devel] " Michael S. Tsirkin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100927125101.12060.53223.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com \ --to=jasowang@redhat.com \ --cc=anthony@codemonkey.ws \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.