[Qemu-devel] [PATCH] Remove unused info_str parameter to pcnet_common_init()

[Qemu-devel] [PATCH] Remove unused info_str parameter to pcnet_common_init()

[Stuart Brady]

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

Re: [Qemu-devel] [PATCH] Remove unused info_str parameter to pcnet_common_init()

[Blue Swirl]

On 1/17/09, Stuart Brady <sdbrady@ntlworld.com> wrote:
> 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>

Thanks, applied as r6362.