From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: [PATCH 1/9] x86/pvh: Don't test 64b-only vcpu_guest_context's fields Date: Fri, 19 Jun 2015 23:09:33 -0400 Message-ID: <1434769773-5157-11-git-send-email-boris.ostrovsky@oracle.com> References: <1434769773-5157-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434769773-5157-1-git-send-email-boris.ostrovsky@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: elena.ufimtseva@oracle.com, Keir Fraser , Andrew Cooper , tim@xen.org, Jan Beulich , Boris Ostrovsky , roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org vcpu_guest_context's fs_base, gs_base_kernel and gs_base_user are not defined for 32-bit guests. Drop PVH 32bitfixme ASSERT. Signed-off-by: Boris Ostrovsky CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper --- xen/arch/x86/domain.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 0363650..e396c6c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -769,16 +769,14 @@ int arch_set_info_guest( } else if ( is_pvh_domain(d) ) { - /* PVH 32bitfixme */ - ASSERT(!compat); - if ( c(ctrlreg[0]) || c(ctrlreg[1]) || c(ctrlreg[2]) || c(ctrlreg[4]) || c(ctrlreg[5]) || c(ctrlreg[6]) || c(ctrlreg[7]) || c(ldt_base) || c(ldt_ents) || c(user_regs.cs) || c(user_regs.ss) || c(user_regs.es) || c(user_regs.ds) || c(user_regs.fs) || c(user_regs.gs) || - c(kernel_ss) || c(kernel_sp) || c.nat->gs_base_kernel || - c.nat->gdt_ents || c.nat->fs_base || c.nat->gs_base_user ) + c(kernel_ss) || c(kernel_sp) || c(gdt_ents) || + (!compat && (c.nat->gs_base_kernel || + c.nat->fs_base || c.nat->gs_base_user)) ) return -EINVAL; } -- 1.7.1