aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOt ten Thije <ottenthije@google.com>2010-10-12 02:01:07 -0700
committerAndroid Code Review <code-review@android.com>2010-10-12 02:01:07 -0700
commit00fa926bdd4c7d169f1124b6029234dcc254bc1f (patch)
tree76e7ec66d189af2516d2fa100da3f2883920cc07
parent1a000857bb7eef298efa787699050884f92311fe (diff)
parent1091d5d16923c044d35fcacfe845ab6b76e83143 (diff)
downloadexternal_qemu-00fa926bdd4c7d169f1124b6029234dcc254bc1f.zip
external_qemu-00fa926bdd4c7d169f1124b6029234dcc254bc1f.tar.gz
external_qemu-00fa926bdd4c7d169f1124b6029234dcc254bc1f.tar.bz2
Merge "Fix segfault when saving VM state."
-rw-r--r--qemu-timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-timer.c b/qemu-timer.c
index 6ad2858..402f567 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -694,7 +694,7 @@ static const VMStateDescription vmstate_timers = {
void configure_icount(const char *option)
{
- register_savevm("timer", 0, 2, timer_save, timer_load, NULL);
+ register_savevm("timer", 0, 2, timer_save, timer_load, &timers_state);
if (!option)
return;