From: Philippe Mathieu-Daudé <[email protected]> Avoid orphan memory regions being added in the /unattached QOM container.
Note this change break the migration of the LM32 milkymist machine. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]> Supersedes: <[email protected]> --- hw/input/milkymist-softusb.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index 7deeb12..72bc7ba 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -259,13 +259,11 @@ static void milkymist_softusb_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(sbd, &s->regs_region); /* register pmem and dmem */ - memory_region_init_ram_nomigrate(&s->pmem, OBJECT(s), "milkymist-softusb.pmem", + memory_region_init_ram(&s->pmem, OBJECT(s), "milkymist-softusb.pmem", s->pmem_size, &error_fatal); - vmstate_register_ram_global(&s->pmem); sysbus_init_mmio(sbd, &s->pmem); - memory_region_init_ram_nomigrate(&s->dmem, OBJECT(s), "milkymist-softusb.dmem", + memory_region_init_ram(&s->dmem, OBJECT(s), "milkymist-softusb.dmem", s->dmem_size, &error_fatal); - vmstate_register_ram_global(&s->dmem); s->dmem_ptr = memory_region_get_ram_ptr(&s->dmem); sysbus_init_mmio(sbd, &s->dmem); @@ -275,8 +273,8 @@ static void milkymist_softusb_realize(DeviceState *dev, Error **errp) static const VMStateDescription vmstate_milkymist_softusb = { .name = "milkymist-softusb", - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, MilkymistSoftUsbState, R_MAX), VMSTATE_HID_KEYBOARD_DEVICE(hid_kbd, MilkymistSoftUsbState), -- 1.8.3.1
