From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LOCt8-0007h3-7D
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 10:15:06 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LOCt6-0007gH-GU
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 10:15:05 -0500
Received: from [199.232.76.173] (port=42017 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LOCt6-0007gC-4F
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 10:15:04 -0500
Received: from mtaout02-winn.ispmail.ntl.com ([81.103.221.48]:26489)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <sdbrady@ntlworld.com>) id 1LOCt5-0004Qx-IY
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 10:15:03 -0500
Received: from aamtaout04-winn.ispmail.ntl.com ([81.103.221.35])
	by mtaout02-winn.ispmail.ntl.com
	(InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id
	<20090117151502.NONY4080.mtaout02-winn.ispmail.ntl.com@aamtaout04-winn.ispmail.ntl.com>
	for <qemu-devel@nongnu.org>; Sat, 17 Jan 2009 15:15:02 +0000
Received: from miranda.arrow ([213.107.23.205])
	by aamtaout04-winn.ispmail.ntl.com
	(InterMail vG.2.02.00.01 201-2161-120-102-20060912) with ESMTP id
	<20090117151502.MNQK22934.aamtaout04-winn.ispmail.ntl.com@miranda.arrow>
	for <qemu-devel@nongnu.org>; Sat, 17 Jan 2009 15:15:02 +0000
Received: from sdb by miranda.arrow with local (Exim 4.63)
	(envelope-from <sdbrady@ntlworld.com>) id 1LOCt1-0004Aa-OQ
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 15:14:59 +0000
Date: Sat, 17 Jan 2009 15:14:59 +0000
From: Stuart Brady <sdbrady@ntlworld.com>
Message-ID: <20090117151459.GA16005@miranda.arrow>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] Remove unused info_str parameter to
	pcnet_common_init()
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

I noticed that pcnet_common_init() takes an unused 'info_str'
parameter, added in r2142.  Since then, we always pass "pcnet"
to register_savevm() (and never "lance").

Note that r6218 changed vc->info_str to "lance" for sun4m emulation.

On the assumption that it's not needed, this patch removes the
parameter.  If reverting the change in r2142, and registering with
"lance" would be preferable, I can submit a patch to do so.

Signed-off-by: Stuart Brady <stuart.brady@gmail.com>

Index: hw/pcnet.c
===================================================================
--- hw/pcnet.c	(revision 6360)
+++ hw/pcnet.c	(working copy)
@@ -1929,7 +1929,7 @@
     return 0;
 }
 
-static void pcnet_common_init(PCNetState *d, NICInfo *nd, const char *info_str)
+static void pcnet_common_init(PCNetState *d, NICInfo *nd)
 {
     d->poll_timer = qemu_new_timer(vm_clock, pcnet_poll_timer, d);
 
@@ -2032,7 +2032,7 @@
     d->phys_mem_write = pci_physical_memory_write;
     d->pci_dev = &d->dev;
 
-    pcnet_common_init(d, nd, "pcnet");
+    pcnet_common_init(d, nd);
 }
 
 /* SPARC32 interface */
@@ -2106,6 +2106,6 @@
     d->phys_mem_read = ledma_memory_read;
     d->phys_mem_write = ledma_memory_write;
 
-    pcnet_common_init(d, nd, "lance");
+    pcnet_common_init(d, nd);
 }
 #endif /* TARGET_SPARC */

-- 
Stuart Brady