ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ide: port microdrive to vmstate 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-10-07 18:52:10 +02:00 committed by Anthony Liguori
parent b38436e3a9
commit 5f637ce06f
1 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
hw/ide/microdrive.c
View File

@ -300,48 +300,23 @@ static void md_common_write(void *opaque, uint32_t at, uint16_t value)
} }
} }
static void md_save(QEMUFile *f, void *opaque) const VMStateDescription vmstate_microdrive = {
{ .name = "microdrive",
MicroDriveState *s = opaque; .version_id = 3,
int i; .minimum_version_id = 0,
.minimum_version_id_old = 0,
qemu_put_8s(f, &s->opt); .fields = (VMStateField []) {
qemu_put_8s(f, &s->stat); VMSTATE_UINT8(opt, MicroDriveState),
qemu_put_8s(f, &s->pins); VMSTATE_UINT8(stat, MicroDriveState),
VMSTATE_UINT8(pins, MicroDriveState),
qemu_put_8s(f, &s->ctrl); VMSTATE_UINT8(ctrl, MicroDriveState),
qemu_put_be16s(f, &s->io); VMSTATE_UINT16(io, MicroDriveState),
qemu_put_byte(f, s->cycle); VMSTATE_UINT8(cycle, MicroDriveState),
VMSTATE_IDE_BUS(bus, MicroDriveState),
idebus_save(f, &s->bus); VMSTATE_IDE_DRIVES(bus.ifs, MicroDriveState),
VMSTATE_END_OF_LIST()
for (i = 0; i < 2; i ++) }
ide_save(f, &s->bus.ifs[i]); };
}
static int md_load(QEMUFile *f, void *opaque, int version_id)
{
MicroDriveState *s = opaque;
int i;
if (version_id != 0 && version_id != 3)
return -EINVAL;
qemu_get_8s(f, &s->opt);
qemu_get_8s(f, &s->stat);
qemu_get_8s(f, &s->pins);
qemu_get_8s(f, &s->ctrl);
qemu_get_be16s(f, &s->io);
s->cycle = qemu_get_byte(f);
idebus_load(f, &s->bus, version_id);
for (i = 0; i < 2; i ++)
ide_load(f, &s->bus.ifs[i], version_id);
return 0;
}
static const uint8_t dscm1xxxx_cis[0x14a] = { static const uint8_t dscm1xxxx_cis[0x14a] = {
[0x000] = CISTPL_DEVICE, /* 5V Device Information */ [0x000] = CISTPL_DEVICE, /* 5V Device Information */
@ -569,7 +544,7 @@ PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv)
md->bus.ifs[0].mdata_size = METADATA_SIZE; md->bus.ifs[0].mdata_size = METADATA_SIZE;
md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE); md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE);
register_savevm("microdrive", -1, 3, md_save, md_load, md); vmstate_register(-1, &vmstate_microdrive, md);
return &md->card; return &md->card;
} }