From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LKcRX-0005oc-Bq
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:43:47 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LKcRW-0005oG-Qj
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:43:47 -0500
Received: from [199.232.76.173] (port=60606 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LKcRW-0005o7-LF
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:43:46 -0500
Received: from savannah.gnu.org ([199.232.41.3]:33997 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LKcRW-0005Al-BF
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:43:46 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LKcRV-0007Ju-Mr
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 17:43:45 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LKcRV-0007Jk-Cy
	for qemu-devel@nongnu.org; Wed, 07 Jan 2009 17:43:45 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LKcRV-0007Jk-Cy@cvs.savannah.gnu.org>
Date: Wed, 07 Jan 2009 17:43:45 +0000
Subject: [Qemu-devel] [6217] Assign a name to each VLAN client (Mark
	McLoughlin)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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

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];
 };