Commit 5653494a authored by Blue Swirl's avatar Blue Swirl
Browse files

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: default avatarStuart Brady <stuart.brady@gmail.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6362 c046a42c-6fe2-441c-8c8c-71466251a162
parent 3b898dda

hw/pcnet.c

+3 −3
Original line number Diff line number Diff line
@@ -1929,7 +1929,7 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id) 
    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 @@ void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn) 
    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 @@ void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, 
    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 */