Revision 967c0da7
b/vl.c | ||
---|---|---|
2261 | 2261 |
DisplayState *ds; |
2262 | 2262 |
DisplayChangeListener *dcl; |
2263 | 2263 |
int cyls, heads, secs, translation; |
2264 |
QemuOpts *hda_opts = NULL, *opts; |
|
2264 |
QemuOpts *hda_opts = NULL, *opts, *machine_opts;
|
|
2265 | 2265 |
QemuOptsList *olist; |
2266 | 2266 |
int optind; |
2267 | 2267 |
const char *optarg; |
... | ... | |
3320 | 3320 |
exit(1); |
3321 | 3321 |
} |
3322 | 3322 |
|
3323 |
kernel_filename = qemu_opt_get(qemu_opts_find(qemu_find_opts("machine"), |
|
3324 |
0), "kernel"); |
|
3325 |
initrd_filename = qemu_opt_get(qemu_opts_find(qemu_find_opts("machine"), |
|
3326 |
0), "initrd"); |
|
3327 |
kernel_cmdline = qemu_opt_get(qemu_opts_find(qemu_find_opts("machine"), |
|
3328 |
0), "append"); |
|
3323 |
machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); |
|
3324 |
if (machine_opts) { |
|
3325 |
kernel_filename = qemu_opt_get(machine_opts, "kernel"); |
|
3326 |
initrd_filename = qemu_opt_get(machine_opts, "initrd"); |
|
3327 |
kernel_cmdline = qemu_opt_get(machine_opts, "append"); |
|
3328 |
} else { |
|
3329 |
kernel_filename = initrd_filename = kernel_cmdline = NULL; |
|
3330 |
} |
|
3331 |
|
|
3329 | 3332 |
if (!kernel_cmdline) { |
3330 | 3333 |
kernel_cmdline = ""; |
3331 | 3334 |
} |
Also available in: Unified diff