From patchwork Tue Jun 1 01:38:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TeLeMan X-Patchwork-Id: 54138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 80DB9B7D1D for ; Tue, 1 Jun 2010 11:39:15 +1000 (EST) Received: from localhost ([127.0.0.1]:44761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJGRj-0000SR-7l for incoming@patchwork.ozlabs.org; Mon, 31 May 2010 21:39:11 -0400 Received: from [140.186.70.92] (port=56852 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJGQv-0000SM-Gw for qemu-devel@nongnu.org; Mon, 31 May 2010 21:38:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJGQu-0002vz-7C for qemu-devel@nongnu.org; Mon, 31 May 2010 21:38:21 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:41143) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJGQu-0002vi-1O for qemu-devel@nongnu.org; Mon, 31 May 2010 21:38:20 -0400 Received: by pvg12 with SMTP id 12so1805379pvg.4 for ; Mon, 31 May 2010 18:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:content-type; bh=IIrD0Qm0Xxpd8gCdfAIqFf7yaQG3Dq68MTD50JTLNHg=; b=aG+OqHUP5+FT0N3ChWsF2Ao5OpCklaXog5iFJd4cQubcbfGVxx/ii9RMIKb4S/4VIb li5/f8cwS3Iwzkl/GHOnGUf3cxKk2FoI2edqw+up4QCXZndqtwqpEm9qb34X3nQo/Zf2 BVIkQDWQ1AAROdKmoAxDiuxfezulZ/uGT3cTo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=XCTOtx0+uqrVwoNlC0wLQhHRJBzUx6KdLOJo3akyCJ1moYUvqUi7AAySXsCLTuWR8R rYPifM890ucfaxkV5WZsbBg4tdY9q/a9iOgZxOSJIbpo5MZDP2aS7hA2IgSSP3UgARst RU12qdXkuDkfX1JIooSAQbdvNpviu7zwQIyaE= MIME-Version: 1.0 Received: by 10.141.214.40 with SMTP id r40mr3916351rvq.11.1275356297133; Mon, 31 May 2010 18:38:17 -0700 (PDT) Received: by 10.141.48.13 with HTTP; Mon, 31 May 2010 18:38:17 -0700 (PDT) Date: Tue, 1 Jun 2010 09:38:17 +0800 Message-ID: From: TeLeMan To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] usb-uhci: fix commit 8e65b7c04965c8355e4ce43211582b6b83054e3d for vmstate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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,[PATCH] usb-uhci: fix commit 8e65b7c04965c8355e4ce43211582b6b83054e3d for vmstate 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() } };