Patchwork [5/7] microblaze: Fix latent bug with default DTB lookup

login
register
mail settings
Submitter Markus Armbruster
Date July 4, 2013, 1:09 p.m.
Message ID <1372943363-24081-6-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/256894/
State New
Headers show

Comments

Markus Armbruster - July 4, 2013, 1:09 p.m.
microblaze_load_kernel() fails to call
qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename) when no -machine
options are given.  This can't normally happen, because -machine
option kernel is mandatory for this target.  Fix it anyway, by using
qemu_get_machine_opts().

Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/microblaze/boot.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
Peter Crosthwaite - July 10, 2013, 3:05 a.m.
On Thu, Jul 4, 2013 at 11:09 PM, Markus Armbruster <armbru@redhat.com> wrote:
> microblaze_load_kernel() fails to call
> qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename) when no -machine
> options are given.  This can't normally happen, because -machine
> option kernel is mandatory for this target.  Fix it anyway, by using
> qemu_get_machine_opts().
>
> Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Acked-by: Peter Croshwaite <peter.crosthwaite@xilinx.com>

> ---
>  hw/microblaze/boot.c | 27 +++++++++++++--------------
>  1 file changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 3f1d70e..5b057f7 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -28,6 +28,7 @@
>  #include "qemu/config-file.h"
>  #include "qemu-common.h"
>  #include "sysemu/device_tree.h"
> +#include "sysemu/sysemu.h"
>  #include "hw/loader.h"
>  #include "elf.h"
>
> @@ -93,20 +94,18 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
>                              void (*machine_cpu_reset)(MicroBlazeCPU *))
>  {
>      QemuOpts *machine_opts;
> -    const char *kernel_filename = NULL;
> -    const char *kernel_cmdline = NULL;
> -
> -    machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
> -    if (machine_opts) {
> -        const char *dtb_arg;
> -        kernel_filename = qemu_opt_get(machine_opts, "kernel");
> -        kernel_cmdline = qemu_opt_get(machine_opts, "append");
> -        dtb_arg = qemu_opt_get(machine_opts, "dtb");
> -        if (dtb_arg) { /* Preference a -dtb argument */
> -            dtb_filename = dtb_arg;
> -        } else { /* default to pcbios dtb as passed by machine_init */
> -            dtb_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);
> -        }
> +    const char *kernel_filename;
> +    const char *kernel_cmdline;
> +    const char *dtb_arg;
> +
> +    machine_opts = qemu_get_machine_opts();
> +    kernel_filename = qemu_opt_get(machine_opts, "kernel");
> +    kernel_cmdline = qemu_opt_get(machine_opts, "append");
> +    dtb_arg = qemu_opt_get(machine_opts, "dtb");
> +    if (dtb_arg) { /* Preference a -dtb argument */
> +        dtb_filename = dtb_arg;
> +    } else { /* default to pcbios dtb as passed by machine_init */
> +        dtb_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);
>      }
>
>      boot_info.machine_cpu_reset = machine_cpu_reset;
> --
> 1.7.11.7
>

Patch

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 3f1d70e..5b057f7 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -28,6 +28,7 @@ 
 #include "qemu/config-file.h"
 #include "qemu-common.h"
 #include "sysemu/device_tree.h"
+#include "sysemu/sysemu.h"
 #include "hw/loader.h"
 #include "elf.h"
 
@@ -93,20 +94,18 @@  void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
                             void (*machine_cpu_reset)(MicroBlazeCPU *))
 {
     QemuOpts *machine_opts;
-    const char *kernel_filename = NULL;
-    const char *kernel_cmdline = NULL;
-
-    machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
-    if (machine_opts) {
-        const char *dtb_arg;
-        kernel_filename = qemu_opt_get(machine_opts, "kernel");
-        kernel_cmdline = qemu_opt_get(machine_opts, "append");
-        dtb_arg = qemu_opt_get(machine_opts, "dtb");
-        if (dtb_arg) { /* Preference a -dtb argument */
-            dtb_filename = dtb_arg;
-        } else { /* default to pcbios dtb as passed by machine_init */
-            dtb_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);
-        }
+    const char *kernel_filename;
+    const char *kernel_cmdline;
+    const char *dtb_arg;
+
+    machine_opts = qemu_get_machine_opts();
+    kernel_filename = qemu_opt_get(machine_opts, "kernel");
+    kernel_cmdline = qemu_opt_get(machine_opts, "append");
+    dtb_arg = qemu_opt_get(machine_opts, "dtb");
+    if (dtb_arg) { /* Preference a -dtb argument */
+        dtb_filename = dtb_arg;
+    } else { /* default to pcbios dtb as passed by machine_init */
+        dtb_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);
     }
 
     boot_info.machine_cpu_reset = machine_cpu_reset;