[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [V5 PATCH 2/4] net: model specific announcing support
From: |
Jason Wang |
Subject: |
[Qemu-devel] [V5 PATCH 2/4] net: model specific announcing support |
Date: |
Fri, 16 Mar 2012 16:55:02 +0800 |
User-agent: |
StGit/0.16-1-g60c4 |
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 <address@hidden>
---
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);
+ }
}
- [Qemu-devel] [V5 PATCH 0/4] Send gratuitous packets by guest, Jason Wang, 2012/03/16
- [Qemu-devel] [V5 PATCH 1/4] net: announce self after vm start, Jason Wang, 2012/03/16
- Re: [Qemu-devel] [V5 PATCH 1/4] net: announce self after vm start, Paolo Bonzini, 2012/03/16
- Re: [Qemu-devel] [V5 PATCH 1/4] net: announce self after vm start, Jason Wang, 2012/03/16
- Re: [Qemu-devel] [V5 PATCH 1/4] net: announce self after vm start, Paolo Bonzini, 2012/03/16
- Re: [Qemu-devel] [V5 PATCH 1/4] net: announce self after vm start, Jason Wang, 2012/03/16
- Re: [Qemu-devel] [V5 PATCH 1/4] net: announce self after vm start, Paolo Bonzini, 2012/03/16
- Re: [Qemu-devel] [V5 PATCH 1/4] net: announce self after vm start, Jason Wang, 2012/03/18
[Qemu-devel] [V5 PATCH 2/4] net: model specific announcing support,
Jason Wang <=
[Qemu-devel] [V5 PATCH 3/4] virtio-net: notify guest to annouce itself, Jason Wang, 2012/03/16
[Qemu-devel] [V5 PATCH 4/4] virtio-net: compat guest announce support., Jason Wang, 2012/03/16
Re: [Qemu-devel] [V5 PATCH 0/4] Send gratuitous packets by guest, Anthony Liguori, 2012/03/26