Re: [Xen-devel] [PATCH 2/2] x86/boot: rename send_chr to print_err

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

On 12/10/2017 21:50, Doug Goldstein wrote:
> From: David Esler <drumandstrum@xxxxxxxxx>
>
> The send_chr function sends an entire C-string and not one character and
> doesn't necessarily just send it over the serial UART anymore so rename
> it to print_err so that its closer in name to what it does.
>
> Reviewed-by: Doug Goldstein <cardoe@xxxxxxxxxx>
> Signed-off-by: David Esler <drumandstrum@xxxxxxxxx>

Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>

This should also be included in 4.10 IMO.

> ---
>  xen/arch/x86/boot/head.S | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S
> index f48bbbd2e5..22348b1bbe 100644
> --- a/xen/arch/x86/boot/head.S
> +++ b/xen/arch/x86/boot/head.S
> @@ -161,7 +161,7 @@ not_multiboot:
>           */
>          add     $sym_offs(.Lbad_ldr_nbs),%esi   # Error message
>          xor     %edi,%edi                       # No VGA text buffer
> -        jmp     .Lsend_chr
> +        jmp     .Lprint_err
>  .Lmb2_efi_ia_32:
>          /*
>           * Here we are on EFI IA-32 platform. Then reliable vga_text_buffer 
> zap is
> @@ -169,10 +169,10 @@ not_multiboot:
>           */
>          add     $sym_offs(.Lbad_efi_msg),%esi   # Error message
>          xor     %edi,%edi                       # No VGA text buffer
> -        jmp     .Lsend_chr
> +        jmp     .Lprint_err
>  .Lget_vtb:
>          mov     sym_esi(vga_text_buffer),%edi
> -.Lsend_chr:
> +.Lprint_err:
>          mov     (%esi),%bl
>          inc     %esi
>          test    %bl,%bl        # Terminate on '\0' sentinel
> @@ -185,11 +185,11 @@ not_multiboot:
>          mov     %bl,%al
>          out     %al,%dx        # Send a character over the serial line
>          test    %edi,%edi      # Is the VGA text buffer available?
> -        jz      .Lsend_chr
> +        jz      .Lprint_err
>          movsb                  # Write a character to the VGA text buffer
>          mov     $7,%al
>          stosb                  # Write an attribute to the VGA text buffer
> -        jmp     .Lsend_chr
> +        jmp     .Lprint_err
>  .Lhalt: hlt
>          jmp     .Lhalt
>  


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel