[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/29] rtc: qidl_declare RTCState
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 04/29] rtc: qidl_declare RTCState |
Date: |
Thu, 1 Nov 2012 08:04:06 -0500 |
Signed-off-by: Michael Roth <address@hidden>
---
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);
--
1.7.9.5
- [Qemu-devel] [PATCH 00/29] QIDL: First Batch of Device Conversions, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 01/29] qemu-timer: add QEMUTimer visitor, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 02/29] qidl: qidl.h, mark common immutable types as q_immutable by default, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 04/29] rtc: qidl_declare RTCState,
Michael Roth <=
- [Qemu-devel] [PATCH 06/29] rtc: add qom property for RTCState state, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 10/29] vga: qidl_declare VGACommonState, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 13/29] cirrus: qidl_declare ISACirrusVGAState, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 15/29] i440fx: qidl_declare PCII440FXState, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 14/29] cirrus: add qom property for isa-cirrus-vga, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 29/29] hpet: add qom property for hpet state, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 27/29] ide: add qom property for piix3/piix4-ide state, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 22/29] pci_bridge_dev: add qom property for pci-bridge state, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 23/29] ide: qidl_declare IDEBus + IDEState + IDEDevice, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 09/29] pci: add qom property for PCIBus instances, Michael Roth, 2012/11/01