1 | Index: ioemu/hw/rtl8139.c |
---|
2 | =================================================================== |
---|
3 | --- ioemu.orig/hw/rtl8139.c 2007-05-02 16:09:35.000000000 +0100 |
---|
4 | +++ ioemu/hw/rtl8139.c 2007-05-02 16:10:56.000000000 +0100 |
---|
5 | @@ -3406,6 +3406,7 @@ |
---|
6 | PCIRTL8139State *d; |
---|
7 | RTL8139State *s; |
---|
8 | uint8_t *pci_conf; |
---|
9 | + int instance; |
---|
10 | |
---|
11 | d = (PCIRTL8139State *)pci_register_device(bus, |
---|
12 | "RTL8139", sizeof(PCIRTL8139State), |
---|
13 | @@ -3456,10 +3457,10 @@ |
---|
14 | s->cplus_txbuffer_len = 0; |
---|
15 | s->cplus_txbuffer_offset = 0; |
---|
16 | |
---|
17 | - /* XXX: instance number ? */ |
---|
18 | - register_savevm("rtl8139", 0, 2, rtl8139_save, rtl8139_load, s); |
---|
19 | - register_savevm("rtl8139_pci", 0, 1, generic_pci_save, generic_pci_load, |
---|
20 | - &d->dev); |
---|
21 | + instance = pci_bus_num(bus) << 8 | s->pci_dev->devfn; |
---|
22 | + register_savevm("rtl8139", instance, 2, rtl8139_save, rtl8139_load, s); |
---|
23 | + register_savevm("rtl8139_pci", instance, 1, generic_pci_save, |
---|
24 | + generic_pci_load, &d->dev); |
---|
25 | |
---|
26 | #if RTL8139_ONBOARD_TIMER |
---|
27 | s->timer = qemu_new_timer(vm_clock, rtl8139_timer, s); |
---|