[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/16] net: add -net nic,netdev= option
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 13/16] net: add -net nic,netdev= option |
Date: |
Thu, 8 Oct 2009 19:58:29 +0100 |
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 41 ++++++++++++++++++++++++++++++++++++-----
net.h | 1 +
2 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/net.c b/net.c
index d6fe84b..3f997cc 100644
--- a/net.c
+++ b/net.c
@@ -2340,6 +2340,19 @@ VLANState *qemu_find_vlan(int id, int allocate)
return vlan;
}
+static VLANClientState *qemu_find_netdev(const char *id)
+{
+ VLANClientState *vc;
+
+ QTAILQ_FOREACH(vc, &non_vlan_clients, next) {
+ if (!strcmp(vc->name, id)) {
+ return vc;
+ }
+ }
+
+ return NULL;
+}
+
static int nic_get_free_idx(void)
{
int index;
@@ -2417,6 +2430,7 @@ static int net_init_nic(QemuOpts *opts,
{
int idx;
NICInfo *nd;
+ const char *netdev;
idx = nic_get_free_idx();
if (idx == -1 || nb_nics >= MAX_NICS) {
@@ -2428,9 +2442,16 @@ static int net_init_nic(QemuOpts *opts,
memset(nd, 0, sizeof(*nd));
- assert(vlan);
- nd->vlan = vlan;
-
+ if ((netdev = qemu_opt_get(opts, "netdev"))) {
+ nd->netdev = qemu_find_netdev(netdev);
+ if (!nd->netdev) {
+ qemu_error("netdev '%s' not found\n", netdev);
+ return -1;
+ }
+ } else {
+ assert(vlan);
+ nd->vlan = vlan;
+ }
if (name) {
nd->name = qemu_strdup(name);
}
@@ -2462,7 +2483,9 @@ static int net_init_nic(QemuOpts *opts,
}
nd->used = 1;
- nd->vlan->nb_guest_devs++;
+ if (vlan) {
+ nd->vlan->nb_guest_devs++;
+ }
nb_nics++;
return idx;
@@ -2821,6 +2844,11 @@ static struct {
.desc = {
NET_COMMON_PARAMS_DESC,
{
+ .name = "netdev",
+ .type = QEMU_OPT_STRING,
+ .help = "id of -netdev to connect to",
+ },
+ {
.name = "macaddr",
.type = QEMU_OPT_STRING,
.help = "MAC address",
@@ -3069,7 +3097,10 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int
is_netdev)
return -1;
}
- if (!is_netdev) {
+ /* Do not add to a vlan if it's a -netdev or a nic with a
+ * netdev= parameter. */
+ if (!(is_netdev ||
+ (strcmp(type, "nic") == 0 && qemu_opt_get(opts, "netdev"))))
{
vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1);
}
diff --git a/net.h b/net.h
index edaf942..e23047c 100644
--- a/net.h
+++ b/net.h
@@ -99,6 +99,7 @@ struct NICInfo {
char *name;
char *devaddr;
VLANState *vlan;
+ VLANClientState *netdev;
VLANClientState *vc;
void *private;
int used;
--
1.6.2.5
- [Qemu-devel] [PATCH 04/16] net: remove unused qemu_handler_true(), (continued)
- [Qemu-devel] [PATCH 04/16] net: remove unused qemu_handler_true(), Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 09/16] net: add QemuOptsList arg to net_client_parse(), Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 10/16] net: add -netdev option, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 07/16] net: use qtailq for vlan and client lists, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 01/16] slirp: fix !CONFIG_SLIRP compilation, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 03/16] net: pass monitor handle to client init functions, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 15/16] net: refactor packet queueing code, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 06/16] net: remove id field from NICInfo, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 05/16] net: handle id= parameter for -net, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 08/16] net: allow clients not associated with a vlan, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 13/16] net: add -net nic,netdev= option,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 14/16] net: allow NICs to be connected to netdevs, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 11/16] net: handle -netdevice options, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 12/16] net: maintain a list of vlan-less clients, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 02/16] hotplug: safely iterate bus's sibling list while removing a device, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 16/16] net: add queue for peer-to-peer packet forwarding, Mark McLoughlin, 2009/10/08
- Re: [Qemu-devel] [PATCH 00/16] Add a -netdev option, Stefan Weil, 2009/10/08