summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-06-11 10:52:32 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-07-01 10:20:41 +0200
commitb5c2c3d0c81ea97ac8443113b9a7a0c0ce25368e (patch)
treed3e2e0e70d70c37083ff8167dd7d9474ebfbca5e /vl.c
parent563890c7c7e977842e2a35afe7a24d06d2103242 (diff)
memory: MemoryRegion: use /machine as default owner
This will be added (after QOMification) as the QOM parent. Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index 41ddcd2678..88feeabd63 100644
--- a/vl.c
+++ b/vl.c
@@ -3986,12 +3986,11 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- cpu_exec_init_all();
-
current_machine = MACHINE(object_new(object_class_get_name(
OBJECT_CLASS(machine_class))));
object_property_add_child(object_get_root(), "machine",
OBJECT(current_machine), &error_abort);
+ cpu_exec_init_all();
if (machine_class->hw_version) {
qemu_set_version(machine_class->hw_version);