Hi With this three patches (on top of the one already in staging) I am able to get migration working with today qemu/master.
- fdc: vmstate+reset qdev change made to use an vmstate that expected an fdctrl_t variable and received a fdctrl_isabus_t variable. You can guess what happened. - qemu_system_reset: moved from main_loop() to before loadvm/incoming migration. We can't reset "after" having loaded state, otherwise we lost the state that we have just loaded. - pci: pcie changes moved config for one array to one pointer. put method was not updated to deal with it. With this I have migration working. ToDo for tomorrow: - check rest of vmstate+reset conversions. - rtl8139 and e1000 still don't work with migration. The networking changes broke them, but I haven't yet found which one. Juan Quintela (3): fdc: fix vmstate variable passed qemu_system_reset: we need to call it before loadvm/migration pci: fix the conversion of config field from array to pointer hw/fdc.c | 33 +++++++++++++++++++++++++++++---- hw/pci.c | 4 ++-- vl.c | 2 +- 3 files changed, 32 insertions(+), 7 deletions(-)