From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LOI4W-0001TC-A9
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 15:47:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LOI4V-0001Ss-O3
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 15:47:11 -0500
Received: from [199.232.76.173] (port=55368 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LOI4V-0001Sl-Ki
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 15:47:11 -0500
Received: from savannah.gnu.org ([199.232.41.3]:41129 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 1LOI4V-0002eZ-9P
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 15:47:11 -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 1LOI4U-0000k1-RR
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 20:47:10 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LOI4U-0000jv-If
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 20:47:10 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LOI4U-0000jv-If@cvs.savannah.gnu.org>
Date: Sat, 17 Jan 2009 20:47:10 +0000
Subject: [Qemu-devel] [6362] 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

Revision: 6362
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6362
Author:   blueswir1
Date:     2009-01-17 20:47:10 +0000 (Sat, 17 Jan 2009)

Log Message:
-----------
Remove unused info_str parameter to pcnet_common_init()

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>

Modified Paths:
--------------
    trunk/hw/pcnet.c

Modified: trunk/hw/pcnet.c
===================================================================
--- trunk/hw/pcnet.c	2009-01-17 18:41:53 UTC (rev 6361)
+++ trunk/hw/pcnet.c	2009-01-17 20:47:10 UTC (rev 6362)
@@ -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 */