Revision 81a322d4 hw/pcnet.c

b/hw/pcnet.c
1948 1948
    qemu_free_timer(d->poll_timer);
1949 1949
}
1950 1950

  
1951
static void pcnet_common_init(DeviceState *dev, PCNetState *s,
1951
static int pcnet_common_init(DeviceState *dev, PCNetState *s,
1952 1952
                              NetCleanup *cleanup)
1953 1953
{
1954 1954
    s->poll_timer = qemu_new_timer(vm_clock, pcnet_poll_timer, s);
......
1959 1959
                                 cleanup, s);
1960 1960
    pcnet_h_reset(s);
1961 1961
    register_savevm("pcnet", -1, 2, pcnet_save, pcnet_load, s);
1962
    return 0;
1962 1963
}
1963 1964

  
1964 1965
/* PCI interface */
......
2015 2016
    return 0;
2016 2017
}
2017 2018

  
2018
static void pci_pcnet_init(PCIDevice *pci_dev)
2019
static int pci_pcnet_init(PCIDevice *pci_dev)
2019 2020
{
2020 2021
    PCIPCNetState *d = (PCIPCNetState *)pci_dev;
2021 2022
    PCNetState *s = &d->state;
......
2061 2062
    s->phys_mem_write = pci_physical_memory_write;
2062 2063
    s->pci_dev = pci_dev;
2063 2064

  
2064
    pcnet_common_init(&pci_dev->qdev, s, pci_pcnet_cleanup);
2065
    return pcnet_common_init(&pci_dev->qdev, s, pci_pcnet_cleanup);
2065 2066
}
2066 2067

  
2067 2068
/* SPARC32 interface */
......
2120 2121
    pcnet_common_cleanup(d);
2121 2122
}
2122 2123

  
2123
static void lance_init(SysBusDevice *dev)
2124
static int lance_init(SysBusDevice *dev)
2124 2125
{
2125 2126
    SysBusPCNetState *d = FROM_SYSBUS(SysBusPCNetState, dev);
2126 2127
    PCNetState *s = &d->state;
......
2137 2138
    s->phys_mem_read = ledma_memory_read;
2138 2139
    s->phys_mem_write = ledma_memory_write;
2139 2140

  
2140
    pcnet_common_init(&dev->qdev, s, lance_cleanup);
2141
    return pcnet_common_init(&dev->qdev, s, lance_cleanup);
2141 2142
}
2142 2143

  
2143 2144
static SysBusDeviceInfo lance_info = {

Also available in: Unified diff