From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LL08T-0007kv-Ur
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:01:42 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LL08S-0007jw-14
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:01:41 -0500
Received: from [199.232.76.173] (port=55725 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LL08R-0007jr-VC
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:01:39 -0500
Received: from savannah.gnu.org ([199.232.41.3]:40473 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 1LL08R-0000GT-6R
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 14:01:39 -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 1LL08Q-000527-6x
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 19:01:38 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LL08P-000523-Oa
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 19:01:38 +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: <E1LL08P-000523-Oa@cvs.savannah.gnu.org>
Date: Thu, 08 Jan 2009 19:01:37 +0000
Subject: [Qemu-devel] [6239] Add model field to nic info (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: 6239
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6239
Author:   aliguori
Date:     2009-01-08 19:01:37 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Add model field to nic info (Mark McLoughlin)

The model type used to be printed as part of the nic info.  It was removed when
the name type was added.  This adds back a model field for those that were
using it previously.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/net.c

Modified: trunk/net.c
===================================================================
--- trunk/net.c	2009-01-08 18:54:57 UTC (rev 6238)
+++ trunk/net.c	2009-01-08 19:01:37 UTC (rev 6239)
@@ -299,7 +299,8 @@
 void qemu_format_nic_info_str(VLANClientState *vc, uint8_t macaddr[6])
 {
     snprintf(vc->info_str, sizeof(vc->info_str),
-             "macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
+             "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
+             vc->model,
              macaddr[0], macaddr[1], macaddr[2],
              macaddr[3], macaddr[4], macaddr[5]);
 }