From patchwork Thu Jun 8 17:11:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9776117 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 CE1BC6034B for ; Thu, 8 Jun 2017 17:18:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2FD62841C for ; Thu, 8 Jun 2017 17:18:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A75B62842B; Thu, 8 Jun 2017 17:18:45 +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 1D86E28508 for ; Thu, 8 Jun 2017 17:18:45 +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 1dJ134-0006Q3-CR; Thu, 08 Jun 2017 17:16:42 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJ133-0006Nj-J5 for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 17:16:41 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id DF/E0-02956-87689395; Thu, 08 Jun 2017 17:16:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeJIrShJLcpLzFFi42JxWrrBXreizTL SYN8VeYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPb/D7GgtW8FXtfnWBuYPzH1cXIySEh4C8x d9MGZhCbTUBZ4mdnLxuILSKgJ9F04DkjiM0skCfR+fEjO4gtLOAn0fbyJQuIzSKgItF9cBNQP QcHr4ClxIqXPBAj5SV2tV1kBbE5gcJLPk9nBikRErCQ6N2ZABIWElCQ6Jh+jAnE5hUQlDg58w kLxCYJiYMvXjBPYOSdhSQ1C0lqASPTKkb14tSistQiXRO9pKLM9IyS3MTMHF1DAzO93NTi4sT 01JzEpGK95PzcTYzAsGEAgh2M3Zf9DzFKcjApifIqtlpGCvEl5adUZiQWZ8QXleakFh9ilOHg UJLg9QbJCRalpqdWpGXmAAMYJi3BwaMkwru2ASjNW1yQmFucmQ6ROsWoKCXOawvSJwCSyCjNg 2uDRc0lRlkpYV5GoEOEeApSi3IzS1DlXzGKczAqCfOKgkzhycwrgZv+CmgxE9DiJe8sQBaXJC KkpBoYdbZU8jObPdvjvyiyVG3i0Sk1k/R0LL78+iroddrL0ObYE8EF3AIzOUrmtU7Oc15pNZG 9iDsz+Ervhwm8Iou9TognzgrXTLtmmlQ88U+/tciRffUc3vMVkzP1V4ddDjb9s4QrSrx1s/Sh SZ/sdojwnOE5ZSQ3jyHNmTdO4JjWi5nW1d6T3p9TYinOSDTUYi4qTgQA9zjRTJUCAAA= X-Env-Sender: prvs=3259bf657=wei.liu2@citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1496942179!94330782!9 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26337 invoked from network); 8 Jun 2017 17:16:40 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-14.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jun 2017 17:16:40 -0000 X-IronPort-AV: E=Sophos;i="5.39,315,1493683200"; d="scan'208";a="435687748" From: Wei Liu To: Xen-devel Date: Thu, 8 Jun 2017 18:11:54 +0100 Message-ID: <20170608171203.20416-19-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608171203.20416-1-wei.liu2@citrix.com> References: <20170608171203.20416-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v4 18/27] x86/traps: move init_int80_direct_trap to pv/traps.c 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: Wei Liu Acked-by: Jan Beulich --- xen/arch/x86/pv/traps.c | 14 ++++++++++++++ xen/arch/x86/x86_64/traps.c | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 0c1600d886..f2556c7e4a 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -342,6 +342,20 @@ int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) return -EIO; } +void init_int80_direct_trap(struct vcpu *v) +{ + struct trap_info *ti = &v->arch.pv_vcpu.trap_ctxt[0x80]; + struct trap_bounce *tb = &v->arch.pv_vcpu.int80_bounce; + + tb->cs = ti->cs; + tb->eip = ti->address; + + if ( null_trap_bounce(v, tb) ) + tb->flags = 0; + else + tb->flags = TBF_EXCEPTION | (TI_GET_IF(ti) ? TBF_INTERRUPT : 0); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 1a8beb8068..d15c9023e8 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -335,20 +335,6 @@ void subarch_percpu_traps_init(void) wrmsrl(MSR_SYSCALL_MASK, XEN_SYSCALL_MASK); } -void init_int80_direct_trap(struct vcpu *v) -{ - struct trap_info *ti = &v->arch.pv_vcpu.trap_ctxt[0x80]; - struct trap_bounce *tb = &v->arch.pv_vcpu.int80_bounce; - - tb->cs = ti->cs; - tb->eip = ti->address; - - if ( null_trap_bounce(v, tb) ) - tb->flags = 0; - else - tb->flags = TBF_EXCEPTION | (TI_GET_IF(ti) ? TBF_INTERRUPT : 0); -} - static void hypercall_page_initialise_ring3_kernel(void *hypercall_page) { char *p;