[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/12] mc146818rtc: add missed field to vmstate
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v2 11/12] mc146818rtc: add missed field to vmstate |
Date: |
Thu, 28 Aug 2014 15:19:25 +0400 |
User-agent: |
StGit/0.16 |
This patch adds irq_reinject_on_ack_count field to VMState to allow correct
saving/loading the state of MC146818 RTC.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
hw/timer/mc146818rtc.c | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 233fc70..61dedcb 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -733,6 +733,22 @@ static int rtc_post_load(void *opaque, int version_id)
return 0;
}
+static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = {
+ .name = "irq_reinject_on_ack_count",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT16(irq_reinject_on_ack_count, RTCState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static bool rtc_irq_reinject_on_ack_count_needed(void *opaque)
+{
+ RTCState *s = (RTCState *)opaque;
+ return s->irq_reinject_on_ack_count != 0;
+}
+
static const VMStateDescription vmstate_rtc = {
.name = "mc146818rtc",
.version_id = 3,
@@ -753,6 +769,14 @@ static const VMStateDescription vmstate_rtc = {
VMSTATE_TIMER_V(update_timer, RTCState, 3),
VMSTATE_UINT64_V(next_alarm_time, RTCState, 3),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (VMStateSubsection[]) {
+ {
+ .vmsd = &vmstate_rtc_irq_reinject_on_ack_count,
+ .needed = rtc_irq_reinject_on_ack_count_needed,
+ }, {
+ /* empty */
+ }
}
};
@@ -785,6 +809,7 @@ static void rtc_reset(void *opaque)
s->cmos_data[RTC_REG_B] &= ~(REG_B_PIE | REG_B_AIE | REG_B_SQWE);
s->cmos_data[RTC_REG_C] &= ~(REG_C_UF | REG_C_IRQF | REG_C_PF | REG_C_AF);
+ s->irq_reinject_on_ack_count = 0;
check_update_timer(s);
qemu_irq_lower(s->irq);
- [Qemu-devel] [PATCH v2 03/12] fdc: adding vmstate for save/restore, (continued)
- [Qemu-devel] [PATCH v2 03/12] fdc: adding vmstate for save/restore, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 04/12] parallel: adding vmstate for save/restore, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 05/12] serial: fixing vmstate for save/restore, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 06/12] apic_common: fixing loading vmstate, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 07/12] apic_common: vapic_paddr synchronization fix, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 08/12] hpet: fixing saving and loading process, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 09/12] pckbd: adding new fields to vmstate, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 10/12] piix: do not raise irq while loading vmstate, Pavel Dovgalyuk, 2014/08/28
- [Qemu-devel] [PATCH v2 11/12] mc146818rtc: add missed field to vmstate,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v2 12/12] pl031: add missed field to vmstate, Pavel Dovgalyuk, 2014/08/28
- Re: [Qemu-devel] [PATCH v2 00/12] Fixing hardware migration issues, Paolo Bonzini, 2014/08/28