From patchwork Thu Nov 1 13:04:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 196226 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 E35B72C00DB for ; Fri, 2 Nov 2012 01:29:10 +1100 (EST) Received: from localhost ([::1]:53323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuT8-0005VY-1w for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 09:05:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuS7-0004dv-Uk for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:04:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuS6-0006B0-KH for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:04:55 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:62691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuS6-00064D-El for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:04:54 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so3616429iea.4 for ; Thu, 01 Nov 2012 06:04:54 -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=Akfeka8R6MV2x0n2wAj752M3ZTMEeppVxrgeDZV07AA=; b=X+bKd+ivqoxeOAuIPvp1Jj0BH1v1tifgVMAgNCMw49GXAgyLcFOjzTQ4EJCRU1mJPD Bq/j2RcxQaVCnOWES0BDJevbGavvhqtGsOE9+Z9E579kM+Uxmgvs2hoOAP8q07d5kLJF yRTifHgY9qDy1GU5UPaf/2Ydc1lQqrvxMTnecy6T9vqWwOOaa5hnB1l5r3Qm2s/twvWu 0xvlPiL0+TOvSZMvk0kum6lA4X0QYchlUIR1e15EbU83c9QS4MZM7EerCklO8dyQWc60 97q3owY1qBbNk+pjNeShyWPA30WsgqPlcYiV1MKW5ZVlmk04wY3JPl9pZw0ZUU8SPb0G aR4A== Received: by 10.50.197.169 with SMTP id iv9mr1139691igc.32.1351775094132; Thu, 01 Nov 2012 06:04:54 -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.04.52 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 06:04:53 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 1 Nov 2012 08:04:06 -0500 Message-Id: <1351775071-7644-5-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.223.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 04/29] rtc: qidl_declare RTCState 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/mc146818rtc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 98839f2..8983d26 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -25,6 +25,7 @@ #include "qemu-timer.h" #include "sysemu.h" #include "mc146818rtc.h" +#include "qidl.h" #ifdef TARGET_I386 #include "apic.h" @@ -56,12 +57,14 @@ #define RTC_CLOCK_RATE 32768 #define UIP_HOLD_LENGTH (8 * NSEC_PER_SEC / 32768) -typedef struct RTCState { +typedef struct RTCState RTCState; + +QIDL_DECLARE(RTCState) { ISADevice dev; MemoryRegion io; uint8_t cmos_data[128]; uint8_t cmos_index; - int32_t base_year; + int32_t q_property("base_year", 1980) base_year; uint64_t base_rtc; uint64_t last_update; int64_t offset; @@ -77,11 +80,13 @@ typedef struct RTCState { uint16_t irq_reinject_on_ack_count; uint32_t irq_coalesced; uint32_t period; - QEMUTimer *coalesced_timer; + bool has_coalesced_timer; + QEMUTimer q_optional *coalesced_timer; Notifier clock_reset_notifier; - LostTickPolicy lost_tick_policy; + LostTickPolicy q_property("lost_tick_policy", LOST_TICK_DISCARD) \ + lost_tick_policy; Notifier suspend_notifier; -} RTCState; +}; static void rtc_set_time(RTCState *s); static void rtc_update_time(RTCState *s);