From: Max Filippov <jcmvbkbc@gmail.com>
Date: Mon, 23 Jun 2014 14:42:39 +0000 (+0400)
Subject: hw/xtensa/xtfpga: retrieve parameters from machine_opts
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=37b259d034c4e6eda5e7a677238d8a5efb666e9f;p=qemu.git

hw/xtensa/xtfpga: retrieve parameters from machine_opts

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 75bc479e36..0aa3eeb046 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -174,9 +174,10 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)
     MemoryRegion *ram, *rom, *system_io;
     DriveInfo *dinfo;
     pflash_t *flash = NULL;
+    QemuOpts *machine_opts = qemu_get_machine_opts();
     const char *cpu_model = machine->cpu_model;
-    const char *kernel_filename = machine->kernel_filename;
-    const char *kernel_cmdline = machine->kernel_cmdline;
+    const char *kernel_filename = qemu_opt_get(machine_opts, "kernel");
+    const char *kernel_cmdline = qemu_opt_get(machine_opts, "append");
     int n;
 
     if (!cpu_model) {