From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54912 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJJ3X-0006cr-4H for qemu-devel@nongnu.org; Tue, 01 Jun 2010 00:26:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJJ3V-0000dH-SJ for qemu-devel@nongnu.org; Tue, 01 Jun 2010 00:26:23 -0400 Received: from mail-px0-f173.google.com ([209.85.212.173]:34910) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJJ3V-0000d1-Ny for qemu-devel@nongnu.org; Tue, 01 Jun 2010 00:26:21 -0400 Received: by pxi2 with SMTP id 2so1861744pxi.4 for ; Mon, 31 May 2010 21:26:20 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 1 Jun 2010 12:26:20 +0800 Message-ID: From: TeLeMan Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH][RESEND] usb-uhci: fix commit 8e65b7c04965c8355e4ce43211582b6b83054e3d for vmstate List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel The commit 8e65b7c04965c8355e4ce43211582b6b83054e3d introduced expire_time of UHCIState. But expire_time is not in vmstate, the second uhci_frame_timer will not be fired immediately after loadvm. Signed-off-by: TeLeMan --- hw/usb-uhci.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 624d55b..d9d74c9 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -375,7 +375,7 @@ static const VMStateDescription vmstate_uhci_port = { static const VMStateDescription vmstate_uhci = { .name = "uhci", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .minimum_version_id_old = 1, .pre_save = uhci_pre_save, @@ -392,6 +392,7 @@ static const VMStateDescription vmstate_uhci = { VMSTATE_UINT8(sof_timing, UHCIState), VMSTATE_UINT8(status2, UHCIState), VMSTATE_TIMER(frame_timer, UHCIState), + VMSTATE_INT64_V(expire_time, UHCIState, 2), VMSTATE_END_OF_LIST() } }; -- 1.6.5.1.1367.gcd48 -- SUN OF A BEACH