From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8Mmq-0003dN-3u for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:40 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8Mml-0003YS-CB for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:39 -0500 Received: from [199.232.76.173] (port=45099 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8Mml-0003YF-7j for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29735) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8Mmk-0001LP-M8 for qemu-devel@nongnu.org; Wed, 11 Nov 2009 18:39:34 -0500 From: Juan Quintela Date: Thu, 12 Nov 2009 00:39:11 +0100 Message-Id: Subject: [Qemu-devel] [PATCH 0/3] Fix migration (take 2) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, glommer@redhat.com, aliguori@us.ibm.com 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(-)