Revision 1941d19c hw/rtl8139.c

b/hw/rtl8139.c
3122 3122
    RTL8139State* s=(RTL8139State*)opaque;
3123 3123
    int i;
3124 3124

  
3125
    pci_device_save(s->pci_dev, f);
3126

  
3125 3127
    qemu_put_buffer(f, s->phys, 6);
3126 3128
    qemu_put_buffer(f, s->mult, 8);
3127 3129

  
......
3203 3205
static int rtl8139_load(QEMUFile* f,void* opaque,int version_id)
3204 3206
{
3205 3207
    RTL8139State* s=(RTL8139State*)opaque;
3206
    int i;
3208
    int i, ret;
3207 3209

  
3208 3210
    /* just 2 versions for now */
3209
    if (version_id > 2)
3211
    if (version_id > 3)
3210 3212
            return -EINVAL;
3211 3213

  
3214
    if (version_id >= 3) {
3215
        ret = pci_device_load(s->pci_dev, f);
3216
        if (ret < 0)
3217
            return ret;
3218
    }
3219

  
3212 3220
    /* saved since version 1 */
3213 3221
    qemu_get_buffer(f, s->phys, 6);
3214 3222
    qemu_get_buffer(f, s->mult, 8);
......
3457 3465
    s->cplus_txbuffer_offset = 0;
3458 3466
             
3459 3467
    /* XXX: instance number ? */
3460
    register_savevm("rtl8139", 0, 2, rtl8139_save, rtl8139_load, s);
3461
    register_savevm("rtl8139_pci", 0, 1, generic_pci_save, generic_pci_load, 
3462
                    &d->dev);
3468
    register_savevm("rtl8139", 0, 3, rtl8139_save, rtl8139_load, s);
3463 3469

  
3464 3470
#if RTL8139_ONBOARD_TIMER
3465 3471
    s->timer = qemu_new_timer(vm_clock, rtl8139_timer, s);

Also available in: Unified diff