[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v4 02/13] migration: migrate icount fields.
From: |
fred . konrad |
Subject: |
[Qemu-devel] [RFC PATCH v4 02/13] migration: migrate icount fields. |
Date: |
Wed, 25 Jun 2014 10:26:37 +0200 |
From: KONRAD Frederic <address@hidden>
This fixes a bug where qemu_icount and qemu_icount_bias are not migrated.
It adds a subsection "timer/icount" to vmstate_timers so icount is migrated only
when needed.
Signed-off-by: KONRAD Frederic <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
---
cpus.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/cpus.c b/cpus.c
index 127de1c..8d2ddf0 100644
--- a/cpus.c
+++ b/cpus.c
@@ -429,6 +429,26 @@ void qemu_clock_warp(QEMUClockType type)
}
}
+static bool icount_state_needed(void *opaque)
+{
+ return use_icount;
+}
+
+/*
+ * This is a subsection for icount migration.
+ */
+static const VMStateDescription icount_vmstate_timers = {
+ .name = "timer/icount",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_INT64(qemu_icount_bias, TimersState),
+ VMSTATE_INT64(qemu_icount, TimersState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const VMStateDescription vmstate_timers = {
.name = "timer",
.version_id = 2,
@@ -438,6 +458,14 @@ static const VMStateDescription vmstate_timers = {
VMSTATE_INT64(dummy, TimersState),
VMSTATE_INT64_V(cpu_clock_offset, TimersState, 2),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (VMStateSubsection[]) {
+ {
+ .vmsd = &icount_vmstate_timers,
+ .needed = icount_state_needed,
+ }, {
+ /* empty */
+ }
}
};
--
1.9.0
- [Qemu-devel] [RFC PATCH v4 00/13] Reverse execution., fred . konrad, 2014/06/25
- [Qemu-devel] [RFC PATCH v4 02/13] migration: migrate icount fields.,
fred . konrad <=
- [Qemu-devel] [RFC PATCH v4 01/13] icount: put icount variables into TimerState., fred . konrad, 2014/06/25
- [Qemu-devel] [RFC PATCH v4 03/13] migration: make qemu_savevm_state public., fred . konrad, 2014/06/25
- [Qemu-devel] [RFC PATCH v4 05/13] icount: check for icount clock deadline when cpu loop exits., fred . konrad, 2014/06/25
- [Qemu-devel] [RFC PATCH v4 04/13] icount: introduce icount timer., fred . konrad, 2014/06/25
- [Qemu-devel] [RFC PATCH v4 06/13] icount: make icount extra computed on icount clock as well., fred . konrad, 2014/06/25
- [Qemu-devel] [RFC PATCH v4 09/13] introduce reverse execution mechanism., fred . konrad, 2014/06/25
- [Qemu-devel] [RFC PATCH v4 07/13] timer: add cpu_icount_to_ns function., fred . konrad, 2014/06/25