summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorThomas Huth2017-02-28 09:52:51 +0100
committerEduardo Habkost2017-04-20 20:22:41 +0200
commit991db247745c1de161d665f847fd28618212f2e8 (patch)
treeabba0264cc85db819058de030063ddbc065ac8dd /hw
parentqdev: Make "hotplugged" property read-only (diff)
downloadqemu-991db247745c1de161d665f847fd28618212f2e8.tar.gz
qemu-991db247745c1de161d665f847fd28618212f2e8.tar.xz
qemu-991db247745c1de161d665f847fd28618212f2e8.zip
hw/core/null-machine: Print error message when using the -kernel parameter
If the user currently tries to use the -kernel parameter, simply nothing happens, and the user might get confused that there is nothing loaded to memory, but also no error message has been issued. Since there is no real generic way to load a kernel on all CPU types (but on some targets, the generic loader can be used instead), issue an appropriate error message here now to avoid the possible confusion. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <1488271971-12624-1-git-send-email-thuth@redhat.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/core/null-machine.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 27c8369b57..864832db34 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -40,6 +40,12 @@ static void machine_none_init(MachineState *mch)
memory_region_allocate_system_memory(ram, NULL, "ram", mch->ram_size);
memory_region_add_subregion(get_system_memory(), 0, ram);
}
+
+ if (mch->kernel_filename) {
+ error_report("The -kernel parameter is not supported "
+ "(use the generic 'loader' device instead).");
+ exit(1);
+ }
}
static void machine_none_machine_init(MachineClass *mc)