From patchwork Thu Oct 12 20:50:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 10002887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B10076028A for ; Thu, 12 Oct 2017 20:54:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1F4E28EC3 for ; Thu, 12 Oct 2017 20:54:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94DFE28DDE; Thu, 12 Oct 2017 20:54:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 678AA28DDE for ; Thu, 12 Oct 2017 20:54:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2kSY-0001RE-I6; Thu, 12 Oct 2017 20:52:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2kSX-0001Qv-7U for xen-devel@lists.xenproject.org; Thu, 12 Oct 2017 20:52:01 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 82/7E-06262-0F5DFD95; Thu, 12 Oct 2017 20:52:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGIsWRWlGSWpSXmKPExsVyMfTGYd23V+9 HGtzrYLP4vmUykwOjx+EPV1gCGKNYM/OS8isSWDN2HL/OUjCDv6Jl0QKWBsYpXF2MXBxCArMY JXbOaGIHcVgE5jFLLFj5jw3EkRDoZ5Vo2XeTqYuRE8jJk1j09S4jhJ0mcfT+FdYuRg4gu1Li2 rU6kLCQgILE7wmHmCCmLmOSeLinnw0kwSagIfHk1wwwW0RASeLeqslgRcwC8xklzt3tYAZJCA tYS/y72MwOYrMIqEpsaFsEtphXwEziybKHLBDL5CV2bBYECXMKmEs0TF/GBhIWAiq5e9lrAqP gAkaGVYzqxalFZalFusZ6SUWZ6RkluYmZObqGBqZ6uanFxYnpqTmJScV6yfm5mxiB4cYABDsY 9/5zOsQoycGkJMqbEXg/UogvKT+lMiOxOCO+qDQntfgQowwHh5IE74MrQDnBotT01Iq0zBxg4 MOkJTh4lER4mYDBL8RbXJCYW5yZDpE6xWjJceHOpT9MHAf23AKSHTfv/mESYsnLz0uVEuc9Dz JPAKQhozQPbhwsOi8xykoJ8zICHSjEU5BalJtZgir/ilGcg1FJmJcFZC1PZl4J3NZXQAcxAR0 kmnYH5KCSRISUVAPj5AVJwpF1nSH7IvkZ9O5m3e5YczhzHktFOv+rwL4HDHc6BAtYl3U7W5S3 tGxbU8v88qt9KHO+TtkfvmUbryzomBzTJqbc4Pz8SXdvnlgQU6iN38tr9mIMPZIb9At15voEl ZjdF/1VbLUzzXTT0VuddtaXDildvJq/RkEtfs+Ojy/7AubfSldiKc5INNRiLipOBADXk2/ayQ IAAA== X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1507841516!67907730!1 X-Originating-IP: [209.85.216.195] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35938 invoked from network); 12 Oct 2017 20:51:57 -0000 Received: from mail-qt0-f195.google.com (HELO mail-qt0-f195.google.com) (209.85.216.195) by server-14.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 12 Oct 2017 20:51:57 -0000 Received: by mail-qt0-f195.google.com with SMTP id z28so13562021qtz.13 for ; Thu, 12 Oct 2017 13:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VW4FrCAsvfEOlh0DNkSAW4Ph3GXEkdftgCmgTHCNPTE=; b=MP/3BfLztpm+DGlJus+1ev6i83OYOJVdexttehKQ64u0vkitXBYuT0FCbt/dR6arER K+ySzKEWWF2mtPgDxhjKjz0BpS5pkWCS479hAM53OHh+aNntEXifdv1dex2/I0f7gCn+ D00Hwn/SuRD+/USGIq5avv3nY6aSRe5c2H+h8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VW4FrCAsvfEOlh0DNkSAW4Ph3GXEkdftgCmgTHCNPTE=; b=l3ADWLRpH5rZVDToagz9Qb3RcpqtIgtB+FCNPxnflhqTdpQ9SFEqHgdx1445tbuOz9 bO5HDMmfmYC95bXuS3jwBheAkes/xKKTtDy0Q0/N3KibTYyvpQ+ywRq+hkptB39NbvdM bBcqdIBIEwc5WS9/GGCt70fGrvemHSNFX38XY/FbefSCuv9JXkkNmAtCNy/Qiu/Bf7Ic RKtxzOPv7S1pqeGUbZqqUbnTwHMoCZkzoyCpYDivrULcEfJ0U9z+v2b0UYlbDpdyEp/J KXEBpgRxdsk9qKILtJ5DkIWCKrkw1+SId20UgQZO8eudZfuZzySLKyOTFSwWxoZujgC/ H5Ng== X-Gm-Message-State: AMCzsaU2pcA3mqO9fT7uIDLyZ/mWdXExHZlcCgo11mNeSSCbuMH0xjFE pF3XwdxnX1708xeKNAsJz79+d9M6c8Q= X-Google-Smtp-Source: AOwi7QAa9mxUX1xfe6pWXHd246rSFD0+cp1LJFPsbeMxZOvd09azHbLXuLZ0LkSekCPigHb7eYevtA== X-Received: by 10.200.46.58 with SMTP id r55mr5661399qta.244.1507841515833; Thu, 12 Oct 2017 13:51:55 -0700 (PDT) Received: from swanson.localdomain (104-179-196-18.lightspeed.brhmal.sbcglobal.net. [104.179.196.18]) by smtp.gmail.com with ESMTPSA id 23sm9812084qkf.68.2017.10.12.13.51.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 13:51:55 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xenproject.org Date: Thu, 12 Oct 2017 15:50:07 -0500 Message-Id: <20171012205007.13001-2-cardoe@cardoe.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171012205007.13001-1-cardoe@cardoe.com> References: <20171012205007.13001-1-cardoe@cardoe.com> Cc: Andrew Cooper , Daniel Kiper , David Esler , Jan Beulich Subject: [Xen-devel] [PATCH 2/2] x86/boot: rename send_chr to print_err X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: David Esler 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 Signed-off-by: David Esler Reviewed-by: Andrew Cooper Reviewed-by: Daniel Kiper --- 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