[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/44] net: introduce NICState and qemu_new_nic()
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 17/44] net: introduce NICState and qemu_new_nic() |
Date: |
Wed, 25 Nov 2009 18:49:10 +0000 |
Common state for all NICs.
The opaque member will replace the opaque member in VLANClientState
since only NICs need it.
The conf member will allow us to iterate over NICs, access the MAC
addr for the NIC and send a packet from each NIC in qemu_announce_self().
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 21 +++++++++++++++++++++
net.h | 11 +++++++++++
2 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/net.c b/net.c
index 355eb87..7195827 100644
--- a/net.c
+++ b/net.c
@@ -293,6 +293,27 @@ VLANClientState *qemu_new_net_client(NetClientInfo *info,
return vc;
}
+NICState *qemu_new_nic(NetClientInfo *info,
+ NICConf *conf,
+ const char *model,
+ const char *name,
+ void *opaque)
+{
+ VLANClientState *nc;
+ NICState *nic;
+
+ assert(info->type == NET_CLIENT_TYPE_NIC);
+ assert(info->size >= sizeof(NICState));
+
+ nc = qemu_new_net_client(info, conf->vlan, conf->peer, model, name);
+
+ nic = DO_UPCAST(NICState, nc, nc);
+ nic->conf = conf;
+ nic->opaque = opaque;
+
+ return nic;
+}
+
VLANClientState *qemu_new_vlan_client(net_client_type type,
VLANState *vlan,
VLANClientState *peer,
diff --git a/net.h b/net.h
index 71a9a44..4de20de 100644
--- a/net.h
+++ b/net.h
@@ -75,6 +75,12 @@ struct VLANClientState {
unsigned receive_disabled : 1;
};
+typedef struct NICState {
+ VLANClientState nc;
+ NICConf *conf;
+ void *opaque;
+} NICState;
+
struct VLANState {
int id;
QTAILQ_HEAD(, VLANClientState) clients;
@@ -90,6 +96,11 @@ VLANClientState *qemu_new_net_client(NetClientInfo *info,
VLANClientState *peer,
const char *model,
const char *name);
+NICState *qemu_new_nic(NetClientInfo *info,
+ NICConf *conf,
+ const char *model,
+ const char *name,
+ void *opaque);
VLANClientState *qemu_new_vlan_client(net_client_type type,
VLANState *vlan,
VLANClientState *peer,
--
1.6.5.2
- [Qemu-devel] [PATCH 01/44] net: move slirp code from net.c to net/slirp.c, (continued)
- [Qemu-devel] [PATCH 01/44] net: move slirp code from net.c to net/slirp.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 02/44] net: move vde code from net.c to net/vde.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 04/44] net: move dump backend code from net.c to net/dump.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 09/44] net: introduce qemu_new_net_client(), Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 06/44] net: remove NICInfo::vc, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 10/44] qdev: move DO_UPCAST() into osdep.h, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 11/44] net: convert tap to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 28/44] net: convert mipsnet to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 17/44] net: introduce NICState and qemu_new_nic(),
Mark McLoughlin <=
- [Qemu-devel] [PATCH 34/44] net: move parse_macaddr() to net/util.[ch], Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 35/44] net: convert xen to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 22/44] net: convert pcnet to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 12/44] net: convert tap-win32 to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 21/44] net: convert ne2000 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 07/44] net: remove NICInfo::private, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 05/44] net: clean up includes in net.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 13/44] net: convert slirp to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 26/44] net: convert LAN9118 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 39/44] net: fix qemu_announce_self(), Mark McLoughlin, 2009/11/25