From patchwork Thu Nov 1 13:04:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 196251 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D58702C036A for ; Fri, 2 Nov 2012 01:52:31 +1100 (EST) Received: from localhost ([::1]:41037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTw8E-0000mR-3k for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 10:52:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSo-0005Gu-9g for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuSg-0006c0-Fc for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:38 -0400 Received: from mail-ia0-f173.google.com ([209.85.210.173]:60542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSg-000627-9D for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:30 -0400 Received: by mail-ia0-f173.google.com with SMTP id m10so1965034iam.4 for ; Thu, 01 Nov 2012 06:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Seql1EFPLr2gZbGj93GaIbCXuVUkr6lfFy75S2FbQGY=; b=VgTr8B0gfBqryzZmSW3PwWinVCnWr1DZ7yrxrOLmVeLdhmP/SKi2jrv4trh0mzP0/M raqxGI6ERkDK1iEvT1raxAz1i3G1yvFY3lLNthK3dXI7QPWL/o657VeElLM9n56o6MyY VatsJHKreNVnXAfDgp63yhdghdARFO6hG6V4D5RNMOp8blnwK2EseO24AVHLNbskFQ5x ZftRRt26XtGg9GnQNb4LP4NXsjJc7E6Q67XSq1L3/C8CKuz7f1OC7A3x0zTi6E80iBVO F1grkWJgtc/WA95XbtWvcV3qDf/EmCu7CxDLv+foAEI98kSaFtwYXtezmozHyBgRgkaT 1obw== Received: by 10.50.161.232 with SMTP id xv8mr1170017igb.22.1351775130026; Thu, 01 Nov 2012 06:05:30 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id dq9sm5734584igc.5.2012.11.01.06.05.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 06:05:29 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 1 Nov 2012 08:04:30 -0500 Message-Id: <1351775071-7644-29-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 28/29] hpet: qidl_declare HPETState + HPETTimer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Roth --- hw/hpet.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/hpet.c b/hw/hpet.c index 50ac067..3beb61e 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -32,6 +32,7 @@ #include "sysbus.h" #include "mc146818rtc.h" #include "i8254.h" +#include "qidl.h" //#define HPET_DEBUG #ifdef HPET_DEBUG @@ -42,11 +43,13 @@ #define HPET_MSI_SUPPORT 0 -struct HPETState; -typedef struct HPETTimer { /* timers */ +typedef struct HPETTimer HPETTimer; +typedef struct HPETState HPETState; + +QIDL_DECLARE(HPETTimer) { /* timers */ uint8_t tn; /*timer number*/ QEMUTimer *qemu_timer; - struct HPETState *state; + struct HPETState q_elsewhere *state; /* parent state */ /* Memory-mapped, software visible timer registers */ uint64_t config; /* configuration/cap */ uint64_t cmp; /* comparator */ @@ -56,9 +59,9 @@ typedef struct HPETTimer { /* timers */ uint8_t wrap_flag; /* timer pop will indicate wrap for one-shot 32-bit * mode. Next pop will be actual timer expiration. */ -} HPETTimer; +}; -typedef struct HPETState { +QIDL_DECLARE(HPETState) { SysBusDevice busdev; MemoryRegion iomem; uint64_t hpet_offset; @@ -75,7 +78,7 @@ typedef struct HPETState { uint64_t isr; /* interrupt status reg */ uint64_t hpet_counter; /* main counter */ uint8_t hpet_id; /* instance id */ -} HPETState; +}; static uint32_t hpet_in_legacy_mode(HPETState *s) {