diff options
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/timers-state.h | 2 | ||||
| -rw-r--r-- | softmmu/vl.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/softmmu/timers-state.h b/softmmu/timers-state.h index 8c262ce139..94bb7394c5 100644 --- a/softmmu/timers-state.h +++ b/softmmu/timers-state.h @@ -47,7 +47,7 @@ typedef struct TimersState { int64_t last_delta; /* Compensate for varying guest execution speed. */ - int64_t qemu_icount_bias; + aligned_int64_t qemu_icount_bias; int64_t vm_clock_warp_start; int64_t cpu_clock_offset; diff --git a/softmmu/vl.c b/softmmu/vl.c index a6c17fa39c..f815acccaa 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2127,6 +2127,7 @@ static void qemu_create_machine(QDict *qdict) QDict *default_opts = keyval_parse(machine_class->default_machine_opts, NULL, NULL, &error_abort); + qemu_apply_legacy_machine_options(default_opts); object_set_properties_from_keyval(OBJECT(current_machine), default_opts, false, &error_abort); qobject_unref(default_opts); |