From patchwork Wed Oct 14 10:57:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35938 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 2985DB70B3 for ; Wed, 14 Oct 2009 21:59:07 +1100 (EST) Received: from localhost ([127.0.0.1]:60142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My1ZP-0002A2-Kv for incoming@patchwork.ozlabs.org; Wed, 14 Oct 2009 06:59:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1My1YD-000299-KD for qemu-devel@nongnu.org; Wed, 14 Oct 2009 06:57:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1My1Y8-00027W-F5 for qemu-devel@nongnu.org; Wed, 14 Oct 2009 06:57:48 -0400 Received: from [199.232.76.173] (port=47808 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My1Y8-00027C-26 for qemu-devel@nongnu.org; Wed, 14 Oct 2009 06:57:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9782) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1My1Y7-0008H7-8y for qemu-devel@nongnu.org; Wed, 14 Oct 2009 06:57:43 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9EAvg32028221 for ; Wed, 14 Oct 2009 06:57:42 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9EAvdub017513; Wed, 14 Oct 2009 06:57:41 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 14 Oct 2009 12:57:13 +0200 Message-Id: <83251b908bbcbe75dcd512d41e3cf5bf4f1b7567.1255517667.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/2] usb-uhci: Add num_ports_vmstate to UHCIState 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 Signed-off-by: Juan Quintela --- hw/usb-uhci.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index a3ed9b2..99aa7d1 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -139,6 +139,7 @@ typedef struct UHCIState { /* Active packets */ UHCIAsync *async_pending; UHCIAsync *async_pool; + uint8_t num_ports_vmstate; } UHCIState; typedef struct UHCI_TD { @@ -353,15 +354,14 @@ static void uhci_reset(void *opaque) static void uhci_save(QEMUFile *f, void *opaque) { UHCIState *s = opaque; - uint8_t num_ports = NB_PORTS; int i; uhci_async_cancel_all(s); pci_device_save(&s->dev, f); - qemu_put_8s(f, &num_ports); - for (i = 0; i < num_ports; ++i) + qemu_put_8s(f, &s->num_ports_vmstate); + for (i = 0; i < s->num_ports_vmstate; ++i) qemu_put_be16s(f, &s->ports[i].ctrl); qemu_put_be16s(f, &s->cmd); qemu_put_be16s(f, &s->status); @@ -376,7 +376,6 @@ static void uhci_save(QEMUFile *f, void *opaque) static int uhci_load(QEMUFile *f, void *opaque, int version_id) { UHCIState *s = opaque; - uint8_t num_ports; int i, ret; if (version_id > 1) @@ -386,11 +385,11 @@ static int uhci_load(QEMUFile *f, void *opaque, int version_id) if (ret < 0) return ret; - qemu_get_8s(f, &num_ports); - if (num_ports != NB_PORTS) + qemu_get_8s(f, &s->num_ports_vmstate); + if (s->num_ports_vmstate != NB_PORTS) return -EINVAL; - for (i = 0; i < num_ports; ++i) + for (i = 0; i < s->num_ports_vmstate; ++i) qemu_get_be16s(f, &s->ports[i].ctrl); qemu_get_be16s(f, &s->cmd); qemu_get_be16s(f, &s->status); @@ -1088,6 +1087,7 @@ static int usb_uhci_common_initfn(UHCIState *s) usb_register_port(&s->bus, &s->ports[i].port, s, i, uhci_attach); } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); + s->num_ports_vmstate = NB_PORTS; qemu_register_reset(uhci_reset, s); uhci_reset(s);