mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl.c: Avoid segfault when started with no arguments

Browse Source 
Fix a bug (introduced in commit a0abe47) where a command line which
specified no machine arguments (either explicitly or implicitly via
-kernel &co) would result in a segfault because of a NULL pointer
returned from qemu_opts_find(qemu_find_opts("machine"), 0).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Peter Maydell 2012-02-22 22:40:00 +00:00 committed by Anthony Liguori
parent 9ebe95fb60
commit 967c0da73a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vl.c
View File

@ -2261,7 +2261,7 @@ int main(int argc, char **argv, char **envp)
DisplayState *ds;
DisplayChangeListener *dcl;
int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts;
QemuOpts *hda_opts = NULL, *opts, *machine_opts;
QemuOptsList *olist;
int optind;
const char *optarg;
@ -3320,12 +3320,15 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
kernel_filename = qemu_opt_get(qemu_opts_find(qemu_find_opts("machine"),
0), "kernel");
initrd_filename = qemu_opt_get(qemu_opts_find(qemu_find_opts("machine"),
0), "initrd");
kernel_cmdline = qemu_opt_get(qemu_opts_find(qemu_find_opts("machine"),
0), "append");
machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
if (machine_opts) {
kernel_filename = qemu_opt_get(machine_opts, "kernel");
initrd_filename = qemu_opt_get(machine_opts, "initrd");
kernel_cmdline = qemu_opt_get(machine_opts, "append");
} else {
kernel_filename = initrd_filename = kernel_cmdline = NULL;
}
if (!kernel_cmdline) {
kernel_cmdline = "";
}