[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v3 12/49] mc146818rtc: add missed field to vmsta
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v3 12/49] mc146818rtc: add missed field to vmstate |
Date: |
Thu, 31 Jul 2014 16:54:35 +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 | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 233fc70..0b78d88 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -698,6 +698,13 @@ int rtc_get_memory(ISADevice *dev, int addr)
return s->cmos_data[addr];
}
+static int rtc_pre_load(void *opaque)
+{
+ RTCState *s = (RTCState *)opaque;
+ s->irq_reinject_on_ack_count = 0;
+ return 0;
+}
+
static void rtc_set_date_from_host(ISADevice *dev)
{
RTCState *s = MC146818_RTC(dev);
@@ -733,10 +740,27 @@ 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,
+ .version_id = 4,
.minimum_version_id = 1,
+ .pre_load = rtc_pre_load,
.post_load = rtc_post_load,
.fields = (VMStateField[]) {
VMSTATE_BUFFER(cmos_data, RTCState),
@@ -753,6 +777,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 */
+ }
}
};
- [Qemu-devel] [RFC PATCH v3 06/49] serial: fixing vmstate for save/restore, (continued)
- [Qemu-devel] [RFC PATCH v3 06/49] serial: fixing vmstate for save/restore, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 07/49] kvmapic: fixing loading vmstate, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 08/49] hpet: fixing saving and loading process, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 09/49] pckbd: adding new fields to vmstate, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 10/49] rtl8139: adding new fields to vmstate, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 11/49] piix: do not raise irq while loading vmstate, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 12/49] mc146818rtc: add missed field to vmstate,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v3 13/49] pl031: add missed field to vmstate, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 14/49] ide pci: reset status field before loading the vmstate, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 15/49] softmmu: fixing usage of cpu_st/ld* from helpers, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 16/49] target-i386: update fp status fix, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 17/49] migration: add vmstate for int8 and char arrays, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 18/49] replay: global variables and function stubs, Pavel Dovgalyuk, 2014/07/31
- [Qemu-devel] [RFC PATCH v3 19/49] block: add suffix parameter to bdrv_open functions, Pavel Dovgalyuk, 2014/07/31