Skip to contentSkip to conversation

cpu: init vmstate for ticks and clock offset

PATCH In review Pavel Dovgalyuk 2 participants 2 messages Sep 1, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpu: init vmstate for ticks and clock offset

Ticks and clock offset used by CPU timers have to be saved in vmstate. But vmstate for these fields registered only in icount mode. Missing registration leads to breaking the continuity when vmstate is loaded. This patch introduces new initialization function which fixes this.

---
 cpus.c                |    8 ++++++--
 include/qemu-common.h |    2 ++
 vl.c                  |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)
cpus.c +6 -2
index 2b5c0bd..c07826d 100644
@@ -492,13 +492,17 @@ static const VMStateDescription vmstate_timers = {
     }
 };
 
+void cpu_ticks_init(void)
+{
+    seqlock_init(&timers_state.vm_clock_seqlock, NULL);
+    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);
+}
+
 void configure_icount(QemuOpts *opts, Error **errp)
 {
     const char *option;
     char *rem_str = NULL;
 
-    seqlock_init(&timers_state.vm_clock_seqlock, NULL);
-    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);
     option = qemu_opt_get(opts, "shift");
     if (!option) {
         if (qemu_opt_get(opts, "align") != NULL) {
include/qemu-common.h +2 -0
index bcf7a6a..dcb57ab 100644
@@ -105,6 +105,8 @@ static inline char *realpath(const char *path, char *resolved_path)
 }
 #endif
 
+void cpu_ticks_init(void);
+
 /* icount */
 void configure_icount(QemuOpts *opts, Error **errp);
 extern int use_icount;
vl.c +1 -0
index b796c67..9241e2d 100644
@@ -4330,6 +4330,7 @@ int main(int argc, char **argv, char **envp)
     qemu_spice_init();
 #endif
 
+    cpu_ticks_init();
     if (icount_opts) {
         if (kvm_enabled() || xen_enabled()) {
             fprintf(stderr, "-icount is not allowed with kvm or xen\n");
#1 lore raw

Il 01/09/2014 07:34, Pavel Dovgalyuk ha scritto:

Quoted 57 lines

Ticks and clock offset used by CPU timers have to be saved in vmstate. But vmstate for these fields registered only in icount mode. Missing registration leads to breaking the continuity when vmstate is loaded. This patch introduces new initialization function which fixes this.

---
 cpus.c                |    8 ++++++--
 include/qemu-common.h |    2 ++
 vl.c                  |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)
cpus.c +6 -2
index 2b5c0bd..c07826d 100644
@@ -492,13 +492,17 @@ static const VMStateDescription vmstate_timers = {
     }
 };
 
+void cpu_ticks_init(void)
+{
+    seqlock_init(&timers_state.vm_clock_seqlock, NULL);
+    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);
+}
+
 void configure_icount(QemuOpts *opts, Error **errp)
 {
     const char *option;
     char *rem_str = NULL;
 
-    seqlock_init(&timers_state.vm_clock_seqlock, NULL);
-    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);
     option = qemu_opt_get(opts, "shift");
     if (!option) {
         if (qemu_opt_get(opts, "align") != NULL) {
include/qemu-common.h +2 -0
index bcf7a6a..dcb57ab 100644
@@ -105,6 +105,8 @@ static inline char *realpath(const char *path, char *resolved_path)
 }
 #endif
 
+void cpu_ticks_init(void);
+
 /* icount */
 void configure_icount(QemuOpts *opts, Error **errp);
 extern int use_icount;
vl.c +0 -0
index b796c67..9241e2d 100644

vl.c int main(int argc, char **argv, char **envp) · line 4336

Quoted 7 lines
vl.c +1 -0
@@ -4330,6 +4330,7 @@ int main(int argc, char **argv, char **envp)
     qemu_spice_init();
 #endif
 
+    cpu_ticks_init();
     if (icount_opts) {
         if (kvm_enabled() || xen_enabled()) {
             fprintf(stderr, "-icount is not allowed with kvm or xen\n");

Thanks, will send a pull request for this ASAP.

Paolo