hw/core/null-machine: Print error message when using the -kernel parameter
PATCH 1/1 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.
--- hw/core/null-machine.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/core/null-machine.c +6 -0
@@ -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)
Signature · 1 line
1.8.3.1
Quoted 20 lines · Thomas Huth
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 <[email protected]>--- hw/core/null-machine.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/core/null-machine.c +0
-0@@ -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);
hw/core/null-machine.c static void machine_none_init(MachineState *mch) · line 51
Quoted 10 lines
hw/core/null-machine.c +6
-0} + +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)
Thanks,
Marcel
Philippe Mathieu-Daudé
Reviewed-byQuoted 30 lines · Marcel Apfelbaum
Quoted 29 lines · Thomas Huth
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 <[email protected]>--- hw/core/null-machine.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/core/null-machine.c +6
-0@@ -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 ); + } }
Quoted 5 lines
Quoted 2 lines
static void
machine_none_machine_init(MachineClass *mc)Reviewed-by Marcel Apfelbaum <[email protected]>
Quoted 4 lines
Thanks,
Marcel
Quoted 8 lines · Thomas Huth
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 <[email protected]>
Applied to my machine-next branch, but I'm unsure if we should break soft freeze and include this on 2.9. I will probably hold it for 2.10.
Quoted 24 lines
--- hw/core/null-machine.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/core/null-machine.c +6
-0@@ -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)Signature · 1 line
1.8.3.1
Signature · 1 line
Eduardo