From patchwork Tue Jun 1 04:26:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TeLeMan X-Patchwork-Id: 54145 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 23255B7D20 for ; Tue, 1 Jun 2010 14:27:56 +1000 (EST) Received: from localhost ([127.0.0.1]:39380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJJ4p-0007EL-JA for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 00:27:43 -0400 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) 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=tFzS4VBWExkwRPpp7BDiQWMszwlnPmeawFeiE4PwiJw=; b=NyFeQue2Bcp06fL0FRl5FLkkJAauJwa5M25BCfJaU7Ftp64vE+VJBUUOjKUUVg4x1y d8iS7tPsM8I0/DgsQ80xzztaQJc7cQEIY2KwEmGiCes8DYGaFaRnJwFiNPC8jmtX5xdx dTCy8OK1HyY/hF+sWEAO+qbt5P/0Zvaj8R128= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=IExUAdN9H6hGbEyN2bQaMFjrYODHxOhJpx5v5uEgHmBT96L9e3xBNqa5QSuZQuGe0F jeRnNDHqmXhSZ6zyN+6p5xGZjI4kWAcuXw4xvzYKbus9Unz8xS6n587HXUpCv5rEdCZG HL8QMuU8rY1fnQODVR5tATPZS6XjfejPLPW0g= MIME-Version: 1.0 Received: by 10.140.252.3 with SMTP id z3mr4002484rvh.285.1275366380416; Mon, 31 May 2010 21:26:20 -0700 (PDT) Received: by 10.141.48.13 with HTTP; Mon, 31 May 2010 21:26:20 -0700 (PDT) Date: Tue, 1 Jun 2010 12:26:20 +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][RESEND] 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, 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() } };