From 676cff2940f3d34e2ef7735df0f83cce958b0d77 Mon Sep 17 00:00:00 2001 From: aliguori Date: Wed, 7 Jan 2009 17:43:44 +0000 Subject: Assign a name to each VLAN client (Mark McLoughlin) Automatically assign a name to each vlan client based on its model, e.g. e1000.0, tap.3 or vde.1. This name is intended to be used by the forthcoming 'set_link' monitor command. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6217 c046a42c-6fe2-441c-8c8c-71466251a162 --- net.c | 21 +++++++++++++++++++++ net.h | 1 + 2 files changed, 22 insertions(+) diff --git a/net.c b/net.c index f3c2b89..c268233 100644 --- a/net.c +++ b/net.c @@ -296,6 +296,25 @@ static int parse_unix_path(struct sockaddr_un *uaddr, const char *str) } #endif +static char *assign_name(VLANClientState *vc1, const char *model) +{ + VLANState *vlan; + char buf[256]; + int id = 0; + + for (vlan = first_vlan; vlan; vlan = vlan->next) { + VLANClientState *vc; + + for (vc = vlan->first_client; vc; vc = vc->next) + if (vc != vc1 && strcmp(vc->model, model) == 0) + id++; + } + + snprintf(buf, sizeof(buf), "%s.%d", model, id); + + return strdup(buf); +} + VLANClientState *qemu_new_vlan_client(VLANState *vlan, const char *model, IOReadHandler *fd_read, @@ -307,6 +326,7 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan, if (!vc) return NULL; vc->model = strdup(model); + vc->name = assign_name(vc, model); vc->fd_read = fd_read; vc->fd_can_read = fd_can_read; vc->opaque = opaque; @@ -327,6 +347,7 @@ void qemu_del_vlan_client(VLANClientState *vc) while (*pvc != NULL) if (*pvc == vc) { *pvc = vc->next; + free(vc->name); free(vc->model); free(vc); break; diff --git a/net.h b/net.h index a2c6a50..078dd18 100644 --- a/net.h +++ b/net.h @@ -19,6 +19,7 @@ struct VLANClientState { struct VLANClientState *next; struct VLANState *vlan; char *model; + char *name; char info_str[256]; }; -- cgit v1.1