From patchwork Tue Feb 28 13:36:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9595639 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 8D0AD60429 for ; Tue, 28 Feb 2017 13:40:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76A3E284D0 for ; Tue, 28 Feb 2017 13:40:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6924E28524; Tue, 28 Feb 2017 13:40:10 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 B8692284D0 for ; Tue, 28 Feb 2017 13:40:09 +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 1cihxf-0005Sd-6F; Tue, 28 Feb 2017 13:37:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cihxd-0005Rn-8r for xen-devel@lists.xenproject.org; Tue, 28 Feb 2017 13:37:01 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 67/36-20914-CFC75B85; Tue, 28 Feb 2017 13:37:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRWlGSWpSXmKPExsXS6fjDS/d3zdY Ig0WHNS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozmQ5sYC/6aVExb18PWwLhTs4uRk0NIIE/i 2/MlrF2MHBy8AnYSR+cFgoQlBAwlnr6/zgZiswioSuw8MJkRxGYTUJdoe7YdrFxEwEDi3NGkL kYuDmaBLkaJuTNmgtUICwRLzDr4jBVivJ3EuqsHweZwCthLXH3dwASxSlDi7w5hkDAzUMmDI1 +ZJjDyzELIzEKSgbC1JB7+usUCYWtLLFv4mhmknFlAWmL5Pw6IsI3E800H2VGVgNjuEk3XPrE sYORYxahenFpUllqka6mXVJSZnlGSm5iZo2toYKyXm1pcnJiempOYVKyXnJ+7iREYqvUMDIw7 GF//dDrEKMnBpCTKm5W8NUKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBO/faqCcYFFqempFWmYOM Gpg0hIcPEoivLdB0rzFBYm5xZnpEKlTjIpS4ryswFgTEgBJZJTmwbXBIvUSo6yUMC8jAwODEE 9BalFuZgmq/CtGcQ5GJWFec5ApPJl5JXDTXwEtZgJa/EIFbHFJIkJKqoFR6RJ39sZ5HJtdXf7 mJd1yXndwrs2WDAd/PY44z2Ureu2rxHwKlYOi+SL3lwRNPKN2VP2t3dOqjeUnN7z5YSWmOrc4 c9LRgt/vVj8pkypyOGhZLFml3c/K+OTvhuCnf878PNqy+KNazD2B9MhD/yVi6lhWhNe/11pY8 8aw8Vyz0m17qxflvx4osRRnJBpqMRcVJwIAsHO/RM8CAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1488289017!87899305!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56264 invoked from network); 28 Feb 2017 13:36:59 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-8.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 28 Feb 2017 13:36:59 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Tue, 28 Feb 2017 06:36:57 -0700 Message-Id: <58B58B06020000780013E3EB@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Tue, 28 Feb 2017 06:36:54 -0700 From: "Jan Beulich" To: "xen-devel" References: <58B588D0020000780013E3C3@prv-mh.provo.novell.com> In-Reply-To: <58B588D0020000780013E3C3@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: George Dunlap , Andrew Cooper , Paul Durrant Subject: [Xen-devel] [PATCH 4/8] x86/HVMemul: switch away from temporary 32-bit register names 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jan Beulich x86/HVMemul: switch away from temporary 32-bit register names Signed-off-by: Jan Beulich --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -442,7 +442,7 @@ static int hvmemul_linear_to_phys( } /* Reverse mode if this is a backwards multi-iteration string operation. */ - reverse = (hvmemul_ctxt->ctxt.regs->_eflags & X86_EFLAGS_DF) && (*reps > 1); + reverse = (hvmemul_ctxt->ctxt.regs->eflags & X86_EFLAGS_DF) && (*reps > 1); if ( reverse && ((PAGE_SIZE - offset) < bytes_per_rep) ) { @@ -539,7 +539,7 @@ static int hvmemul_virtual_to_linear( if ( IS_ERR(reg) ) return -PTR_ERR(reg); - if ( (hvmemul_ctxt->ctxt.regs->_eflags & X86_EFLAGS_DF) && (*reps > 1) ) + if ( (hvmemul_ctxt->ctxt.regs->eflags & X86_EFLAGS_DF) && (*reps > 1) ) { /* * x86_emulate() clips the repetition count to ensure we don't wrap @@ -1085,7 +1085,7 @@ static int hvmemul_rep_ins( return X86EMUL_UNHANDLEABLE; return hvmemul_do_pio_addr(src_port, reps, bytes_per_rep, IOREQ_READ, - !!(ctxt->regs->_eflags & X86_EFLAGS_DF), gpa); + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_outs_set_context( @@ -1154,7 +1154,7 @@ static int hvmemul_rep_outs( return X86EMUL_UNHANDLEABLE; return hvmemul_do_pio_addr(dst_port, reps, bytes_per_rep, IOREQ_WRITE, - !!(ctxt->regs->_eflags & X86_EFLAGS_DF), gpa); + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_movs( @@ -1173,7 +1173,7 @@ static int hvmemul_rep_movs( paddr_t sgpa, dgpa; uint32_t pfec = PFEC_page_present; p2m_type_t sp2mt, dp2mt; - int rc, df = !!(ctxt->regs->_eflags & X86_EFLAGS_DF); + int rc, df = !!(ctxt->regs->eflags & X86_EFLAGS_DF); char *buf; rc = hvmemul_virtual_to_linear( @@ -1327,7 +1327,7 @@ static int hvmemul_rep_stos( unsigned long addr, bytes; paddr_t gpa; p2m_type_t p2mt; - bool_t df = !!(ctxt->regs->_eflags & X86_EFLAGS_DF); + bool_t df = !!(ctxt->regs->eflags & X86_EFLAGS_DF); int rc = hvmemul_virtual_to_linear(seg, offset, bytes_per_rep, reps, hvm_access_write, hvmemul_ctxt, &addr); @@ -1775,7 +1775,7 @@ static int _hvm_emulate_one(struct hvm_e if ( hvmemul_ctxt->ctxt.retire.hlt && !hvm_local_events_need_delivery(curr) ) { - hvm_hlt(regs->_eflags); + hvm_hlt(regs->eflags); } return X86EMUL_OKAY; --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -136,7 +136,7 @@ bool handle_pio(uint16_t port, unsigned ASSERT((size - 1) < 4 && size != 3); if ( dir == IOREQ_WRITE ) - data = guest_cpu_user_regs()->_eax; + data = guest_cpu_user_regs()->eax; rc = hvmemul_do_pio_buffer(port, size, dir, &data); Reviewed-by: Paul Durrant --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -442,7 +442,7 @@ static int hvmemul_linear_to_phys( } /* Reverse mode if this is a backwards multi-iteration string operation. */ - reverse = (hvmemul_ctxt->ctxt.regs->_eflags & X86_EFLAGS_DF) && (*reps > 1); + reverse = (hvmemul_ctxt->ctxt.regs->eflags & X86_EFLAGS_DF) && (*reps > 1); if ( reverse && ((PAGE_SIZE - offset) < bytes_per_rep) ) { @@ -539,7 +539,7 @@ static int hvmemul_virtual_to_linear( if ( IS_ERR(reg) ) return -PTR_ERR(reg); - if ( (hvmemul_ctxt->ctxt.regs->_eflags & X86_EFLAGS_DF) && (*reps > 1) ) + if ( (hvmemul_ctxt->ctxt.regs->eflags & X86_EFLAGS_DF) && (*reps > 1) ) { /* * x86_emulate() clips the repetition count to ensure we don't wrap @@ -1085,7 +1085,7 @@ static int hvmemul_rep_ins( return X86EMUL_UNHANDLEABLE; return hvmemul_do_pio_addr(src_port, reps, bytes_per_rep, IOREQ_READ, - !!(ctxt->regs->_eflags & X86_EFLAGS_DF), gpa); + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_outs_set_context( @@ -1154,7 +1154,7 @@ static int hvmemul_rep_outs( return X86EMUL_UNHANDLEABLE; return hvmemul_do_pio_addr(dst_port, reps, bytes_per_rep, IOREQ_WRITE, - !!(ctxt->regs->_eflags & X86_EFLAGS_DF), gpa); + !!(ctxt->regs->eflags & X86_EFLAGS_DF), gpa); } static int hvmemul_rep_movs( @@ -1173,7 +1173,7 @@ static int hvmemul_rep_movs( paddr_t sgpa, dgpa; uint32_t pfec = PFEC_page_present; p2m_type_t sp2mt, dp2mt; - int rc, df = !!(ctxt->regs->_eflags & X86_EFLAGS_DF); + int rc, df = !!(ctxt->regs->eflags & X86_EFLAGS_DF); char *buf; rc = hvmemul_virtual_to_linear( @@ -1327,7 +1327,7 @@ static int hvmemul_rep_stos( unsigned long addr, bytes; paddr_t gpa; p2m_type_t p2mt; - bool_t df = !!(ctxt->regs->_eflags & X86_EFLAGS_DF); + bool_t df = !!(ctxt->regs->eflags & X86_EFLAGS_DF); int rc = hvmemul_virtual_to_linear(seg, offset, bytes_per_rep, reps, hvm_access_write, hvmemul_ctxt, &addr); @@ -1775,7 +1775,7 @@ static int _hvm_emulate_one(struct hvm_e if ( hvmemul_ctxt->ctxt.retire.hlt && !hvm_local_events_need_delivery(curr) ) { - hvm_hlt(regs->_eflags); + hvm_hlt(regs->eflags); } return X86EMUL_OKAY; --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -136,7 +136,7 @@ bool handle_pio(uint16_t port, unsigned ASSERT((size - 1) < 4 && size != 3); if ( dir == IOREQ_WRITE ) - data = guest_cpu_user_regs()->_eax; + data = guest_cpu_user_regs()->eax; rc = hvmemul_do_pio_buffer(port, size, dir, &data);