OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Assign a name to each VLAN client (Mark McLoughlin)

Browse Source 
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 <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6217 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-01-07 17:43:44 +00:00
parent bf38c1a0e1
commit 676cff2940
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net.c
View File

@ -296,6 +296,25 @@ static int parse_unix_path(struct sockaddr_un *uaddr, const char *str)
} }
#endif #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, VLANClientState *qemu_new_vlan_client(VLANState *vlan,
const char *model, const char *model,
IOReadHandler *fd_read, IOReadHandler *fd_read,
@ -307,6 +326,7 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
if (!vc) if (!vc)
return NULL; return NULL;
vc->model = strdup(model); vc->model = strdup(model);
vc->name = assign_name(vc, model);
vc->fd_read = fd_read; vc->fd_read = fd_read;
vc->fd_can_read = fd_can_read; vc->fd_can_read = fd_can_read;
vc->opaque = opaque; vc->opaque = opaque;
@ -327,6 +347,7 @@ void qemu_del_vlan_client(VLANClientState *vc)
while (*pvc != NULL) while (*pvc != NULL)
if (*pvc == vc) { if (*pvc == vc) {
*pvc = vc->next; *pvc = vc->next;
free(vc->name);
free(vc->model); free(vc->model);
free(vc); free(vc);
break; break;

1
net.h
View File

@ -19,6 +19,7 @@ struct VLANClientState {
struct VLANClientState *next; struct VLANClientState *next;
struct VLANState *vlan; struct VLANState *vlan;
char *model; char *model;
char *name;
char info_str[256]; char info_str[256];
}; };