OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Sparc32: port IOMMU to VMState design 

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-08-28 20:46:21 +00:00
parent 75c497dca9
commit db3c9e08e0
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/iommu.c
View File

@ -328,30 +328,17 @@ void sparc_iommu_memory_rw(void *opaque, target_phys_addr_t addr,
} }
} }
static void iommu_save(QEMUFile *f, void *opaque) static const VMStateDescription vmstate_iommu = {
{ .name ="iommu",
IOMMUState *s = opaque; .version_id = 2,
int i; .minimum_version_id = 2,
.minimum_version_id_old = 2,
for (i = 0; i < IOMMU_NREGS; i++) .fields = (VMStateField []) {
qemu_put_be32s(f, &s->regs[i]); VMSTATE_UINT32_ARRAY(regs, IOMMUState, IOMMU_NREGS),
qemu_put_be64s(f, &s->iostart); VMSTATE_UINT64(iostart, IOMMUState),
} VMSTATE_END_OF_LIST()
static int iommu_load(QEMUFile *f, void *opaque, int version_id)
{
IOMMUState *s = opaque;
int i;
if (version_id != 2)
return -EINVAL;
for (i = 0; i < IOMMU_NREGS; i++)
qemu_get_be32s(f, &s->regs[i]);
qemu_get_be64s(f, &s->iostart);
return 0;
} }
};
static void iommu_reset(void *opaque) static void iommu_reset(void *opaque)
{ {
@ -376,7 +363,7 @@ static int iommu_init1(SysBusDevice *dev)
io = cpu_register_io_memory(iommu_mem_read, iommu_mem_write, s); io = cpu_register_io_memory(iommu_mem_read, iommu_mem_write, s);
sysbus_init_mmio(dev, IOMMU_NREGS * sizeof(uint32_t), io); sysbus_init_mmio(dev, IOMMU_NREGS * sizeof(uint32_t), io);
register_savevm("iommu", -1, 2, iommu_save, iommu_load, s); vmstate_register(-1, &vmstate_iommu, s);
qemu_register_reset(iommu_reset, s); qemu_register_reset(iommu_reset, s);
iommu_reset(s); iommu_reset(s);
return 0; return 0;