[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6217] Assign a name to each VLAN client (Mark McLoughlin)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6217] Assign a name to each VLAN client (Mark McLoughlin) |
Date: |
Wed, 07 Jan 2009 17:43:45 +0000 |
Revision: 6217
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6217
Author: aliguori
Date: 2009-01-07 17:43:44 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/net.c
trunk/net.h
Modified: trunk/net.c
===================================================================
--- trunk/net.c 2009-01-07 17:42:25 UTC (rev 6216)
+++ trunk/net.c 2009-01-07 17:43:44 UTC (rev 6217)
@@ -296,6 +296,25 @@
}
#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 @@
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 @@
while (*pvc != NULL)
if (*pvc == vc) {
*pvc = vc->next;
+ free(vc->name);
free(vc->model);
free(vc);
break;
Modified: trunk/net.h
===================================================================
--- trunk/net.h 2009-01-07 17:42:25 UTC (rev 6216)
+++ trunk/net.h 2009-01-07 17:43:44 UTC (rev 6217)
@@ -19,6 +19,7 @@
struct VLANClientState *next;
struct VLANState *vlan;
char *model;
+ char *name;
char info_str[256];
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6217] Assign a name to each VLAN client (Mark McLoughlin),
Anthony Liguori <=