haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Sparc32: port Slavio misc devices to VMState design

Browse source 
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-08-29 16:37:09 +03:00
parent c21011a963
commit d37adb099c
1 changed files with 19 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
hw/slavio_misc.c
View file

@ -47,10 +47,11 @@
typedef struct MiscState { typedef struct MiscState {
SysBusDevice busdev; SysBusDevice busdev;
qemu_irq irq; qemu_irq irq;
uint32_t dummy;
uint8_t config; uint8_t config;
uint8_t aux1, aux2; uint8_t aux1, aux2;
uint8_t diag, mctrl; uint8_t diag, mctrl;
uint32_t sysctrl; uint8_t sysctrl;
uint16_t leds; uint16_t leds;
qemu_irq fdc_tc; qemu_irq fdc_tc;
} MiscState; } MiscState;
@ -398,41 +399,22 @@ static CPUWriteMemoryFunc * const slavio_led_mem_write[3] = {
NULL, NULL,
}; };
static void slavio_misc_save(QEMUFile *f, void *opaque) static const VMStateDescription vmstate_misc = {
{ .name ="slavio_misc",
MiscState *s = opaque; .version_id = 1,
uint32_t tmp = 0; .minimum_version_id = 1,
uint8_t tmp8; .minimum_version_id_old = 1,
.fields = (VMStateField []) {
qemu_put_be32s(f, &tmp); /* ignored, was IRQ. */ VMSTATE_UINT32(dummy, MiscState),
qemu_put_8s(f, &s->config); VMSTATE_UINT8(config, MiscState),
qemu_put_8s(f, &s->aux1); VMSTATE_UINT8(aux1, MiscState),
qemu_put_8s(f, &s->aux2); VMSTATE_UINT8(aux2, MiscState),
qemu_put_8s(f, &s->diag); VMSTATE_UINT8(diag, MiscState),
qemu_put_8s(f, &s->mctrl); VMSTATE_UINT8(mctrl, MiscState),
tmp8 = s->sysctrl & 0xff; VMSTATE_UINT8(sysctrl, MiscState),
qemu_put_8s(f, &tmp8); VMSTATE_END_OF_LIST()
} }
};
static int slavio_misc_load(QEMUFile *f, void *opaque, int version_id)
{
MiscState *s = opaque;
uint32_t tmp;
uint8_t tmp8;
if (version_id != 1)
return -EINVAL;
qemu_get_be32s(f, &tmp);
qemu_get_8s(f, &s->config);
qemu_get_8s(f, &s->aux1);
qemu_get_8s(f, &s->aux2);
qemu_get_8s(f, &s->diag);
qemu_get_8s(f, &s->mctrl);
qemu_get_8s(f, &tmp8);
s->sysctrl = (uint32_t)tmp8;
return 0;
}
static int apc_init1(SysBusDevice *dev) static int apc_init1(SysBusDevice *dev)
{ {
@ -495,8 +477,7 @@ static int slavio_misc_init1(SysBusDevice *dev)
qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1); qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1);
register_savevm("slavio_misc", -1, 1, slavio_misc_save, slavio_misc_load, vmstate_register(-1, &vmstate_misc, s);
s);
qemu_register_reset(slavio_misc_reset, s); qemu_register_reset(slavio_misc_reset, s);
slavio_misc_reset(s); slavio_misc_reset(s);
return 0; return 0;