From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: amit.shah@redhat.com, dgilbert@redhat.com,
Pavel.Dovgaluk@ispras.ru, quintela@redhat.com
Subject: [Qemu-devel] [PATCH 10/10] mc146818rtc: add missed field to vmstate
Date: Tue, 9 Sep 2014 14:30:09 +0200 [thread overview]
Message-ID: <1410265809-27247-11-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1410265809-27247-1-git-send-email-pbonzini@redhat.com>
From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
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 <Pavel.Dovgaluk@ispras.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/timer/mc146818rtc.c | 24 +++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 17912b8..2c4b650 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 */
+ }
}
};
--
2.1.0
next prev parent reply other threads:[~2014-09-09 12:31 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-09 12:29 [Qemu-devel] [PATCH 00/10] x86: migrate more data Paolo Bonzini
2014-09-09 12:30 ` [Qemu-devel] [PATCH 01/10] vl: use QLIST_FOREACH_SAFE to visit change state handlers Paolo Bonzini
2014-09-09 13:09 ` Juan Quintela
2014-09-09 12:30 ` [Qemu-devel] [PATCH 02/10] apic_common: vapic_paddr synchronization fix Paolo Bonzini
2014-09-09 13:10 ` Juan Quintela
2014-09-09 14:00 ` Michael S. Tsirkin
2014-09-09 14:26 ` Paolo Bonzini
2014-09-10 6:55 ` Pavel Dovgaluk
2014-09-09 12:30 ` [Qemu-devel] [PATCH 03/10] cpu: init vmstate for ticks and clock offset Paolo Bonzini
2014-09-09 13:25 ` Juan Quintela
2014-09-09 13:26 ` Paolo Bonzini
2014-09-09 12:30 ` [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore Paolo Bonzini
2014-09-09 13:26 ` Juan Quintela
2014-09-09 13:28 ` Paolo Bonzini
2014-09-10 12:02 ` Michael S. Tsirkin
2014-09-10 10:59 ` Paolo Bonzini
2014-09-10 12:20 ` Michael S. Tsirkin
2014-09-10 11:24 ` Paolo Bonzini
2014-09-09 12:30 ` [Qemu-devel] [PATCH 05/10] fdc: " Paolo Bonzini
2014-09-09 13:29 ` Juan Quintela
2014-09-09 12:30 ` [Qemu-devel] [PATCH 06/10] parallel: " Paolo Bonzini
2014-09-09 13:32 ` Juan Quintela
2014-09-09 13:40 ` Paolo Bonzini
2014-09-10 12:09 ` Michael S. Tsirkin
2014-09-10 11:16 ` Paolo Bonzini
2014-09-09 12:30 ` [Qemu-devel] [PATCH 07/10] serial: fixing " Paolo Bonzini
2014-09-09 13:59 ` Juan Quintela
2014-09-09 16:24 ` Paolo Bonzini
2014-09-10 11:24 ` Pavel Dovgaluk
2014-09-10 10:41 ` Paolo Bonzini
2014-09-09 12:30 ` [Qemu-devel] [PATCH 08/10] pckbd: adding new fields to vmstate Paolo Bonzini
2014-09-09 13:07 ` Juan Quintela
2014-09-10 10:14 ` Paolo Bonzini
2014-09-09 12:30 ` [Qemu-devel] [PATCH 09/10] piix: do not raise irq while loading vmstate Paolo Bonzini
2014-09-09 13:37 ` Juan Quintela
2014-09-09 13:54 ` Michael S. Tsirkin
2014-09-09 17:16 ` Paolo Bonzini
2014-09-09 20:51 ` Michael S. Tsirkin
2014-09-10 8:38 ` Paolo Bonzini
2014-09-10 8:51 ` Peter Maydell
2014-09-10 9:05 ` Paolo Bonzini
2014-09-10 10:20 ` Michael S. Tsirkin
2014-09-10 10:50 ` Michael S. Tsirkin
2014-09-10 9:58 ` Paolo Bonzini
2014-09-10 11:04 ` Michael S. Tsirkin
2014-09-10 10:07 ` Paolo Bonzini
2014-09-10 11:26 ` Michael S. Tsirkin
2014-09-09 12:30 ` Paolo Bonzini [this message]
2014-09-09 12:58 ` [Qemu-devel] [PATCH 10/10] mc146818rtc: add missed field to vmstate Juan Quintela
2014-09-10 10:50 ` [Qemu-devel] [PATCH 00/10] x86: migrate more data Paolo Bonzini
2014-09-10 11:56 ` Michael S. Tsirkin
2014-09-10 10:58 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410265809-27247-11-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=Pavel.Dovgaluk@ispras.ru \
--cc=amit.shah@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).