Re: [Qemu-devel] [PATCH] hw/s390x/ipl: Bail out if the network bootloader can not be found

[David Hildenbrand <david@redhat.com>]

On 27.02.2018 11:05, Thomas Huth wrote:
> If QEMU fails to load 's390-netboot.img', the guest firmware currently
> loops forever and just floods the console with "Network boot device
> detected" messages. The code in ipl.c apparently already tried to stop
> the VM with vm_stop() in this case, but this is in vain since the run
> state is later reset due to a call to vm_start() from vl.c again.
> To avoid the ugly firmware loop, let's simply exit QEMU directly instead
> since it just does not make sense to continue if the required firmware
> image can not be loaded. While we're at it, also add the file name of
> the netboot binary to the error message, so that the user has a better
> hint about what is missing.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  hw/s390x/ipl.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 0d06fc1..ff8308e 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -322,7 +322,8 @@ static int load_netboot_image(Error **errp)
>  
>      netboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, ipl->netboot_fw);
>      if (netboot_filename == NULL) {
> -        error_setg(errp, "Could not find network bootloader");
> +        error_setg(errp, "Could not find network bootloader '%s'",
> +                   ipl->netboot_fw);
>          goto unref_mr;
>      }
>  
> @@ -416,7 +417,7 @@ void s390_ipl_prepare_cpu(S390CPU *cpu)
>      if (ipl->netboot) {
>          if (load_netboot_image(&err) < 0) {
>              error_report_err(err);
> -            vm_stop(RUN_STATE_INTERNAL_ERROR);
> +            exit(1);
>          }
>          ipl->iplb.ccw.netboot_start_addr = cpu_to_be64(ipl->start_addr);
>      }
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 

Thanks,

David / dhildenb