On Tue, Feb 28, 2017 at 09:52:51AM +0100, Thomas Huth wrote:
> 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 <th...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
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.
> ---
> hw/core/null-machine.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
> index 27c8369..864832d 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)
> --
> 1.8.3.1
>
--
Eduardo
