diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 17:29:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 17:29:03 +0100 |
| commit | 895527eea5e57695f76c5e41def531d7f1d80917 (patch) | |
| tree | 38f78da19df850ef7e54008885a8be8b0ec2ccc9 /hw/dma/sun4m_iommu.c | |
| parent | 50cb70d1853ecd30ce3a83d7fb73835d4540c63b (diff) | |
| parent | 719ffe1f5f72b1c7ace4afe9ba2815bcb53a829e (diff) | |
| download | focaccia-qemu-895527eea5e57695f76c5e41def531d7f1d80917.tar.gz focaccia-qemu-895527eea5e57695f76c5e41def531d7f1d80917.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140515' into staging
migration/next for 20140515 # gpg: Signature made Thu 15 May 2014 02:32:25 BST using RSA key ID 5872D723 # gpg: Can't check signature: public key not found * remotes/juanquintela/tags/migration/20140515: usb: fix up post load checks migration: show average throughput when migration finishes savevm: Remove all the unneeded version_minimum_id_old (rest) savevm: Remove all the unneeded version_minimum_id_old (usb) Split ram_save_block arch_init: Simplify code for load_xbzrle() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/dma/sun4m_iommu.c')
| -rw-r--r-- | hw/dma/sun4m_iommu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c index 899d454353..ec7c2efcd9 100644 --- a/hw/dma/sun4m_iommu.c +++ b/hw/dma/sun4m_iommu.c @@ -327,8 +327,7 @@ static const VMStateDescription vmstate_iommu = { .name ="iommu", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, IOMMUState, IOMMU_NREGS), VMSTATE_UINT64(iostart, IOMMUState), VMSTATE_END_OF_LIST() |