summary refs log tree commit diff stats
path: root/hw/arm/boot.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-11-02 09:44:36 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2020-12-15 12:51:55 -0500
commitf2ce39b4f067fe8b8de6104a2d8ac558d35c330b (patch)
tree0d6c327eb7b5522347c7f465d403829af4f2ec6e /hw/arm/boot.c
parent55810e90cc9a5ca18289c25aa5c1e0e2dc77eadb (diff)
downloadfocaccia-qemu-f2ce39b4f067fe8b8de6104a2d8ac558d35c330b.tar.gz
focaccia-qemu-f2ce39b4f067fe8b8de6104a2d8ac558d35c330b.zip
vl: make qemu_get_machine_opts static
Machine options can be retrieved as properties of the machine object.
Encourage that by removing the "easy" accessor to machine options.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/arm/boot.c')
-rw-r--r--hw/arm/boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 4d9d47ba1c..e56c42ac22 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -1299,7 +1299,7 @@ void arm_load_kernel(ARMCPU *cpu, MachineState *ms, struct arm_boot_info *info)
     info->kernel_filename = ms->kernel_filename;
     info->kernel_cmdline = ms->kernel_cmdline;
     info->initrd_filename = ms->initrd_filename;
-    info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");
+    info->dtb_filename = ms->dtb;
     info->dtb_limit = 0;
 
     /* Load the kernel.  */