From: Christoph Egger Subject: [PATCH 10/15] Nested Virtualization: interrupts (generic part) Date: Thu, 3 Jun 2010 18:17:39 +0200 Message-ID: <201006031817.40116.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_kW9BMzrvodwORzR" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-00=_kW9BMzrvodwORzR Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_kW9BMzrvodwORzR Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_nh10_interrupts.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_nh10_interrupts.diff" # HG changeset patch # User cegger # Date 1275382033 -7200 Handle interrupts (generic part) diff -r 11f96c916410 -r 5a68e35f53af xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2284,10 +2284,19 @@ enum hvm_intblk hvm_interrupt_blocked(st ASSERT(v == current); + if ( nestedhvm_enabled(v->domain) && !nestedhvm_gif_isset(v) ) + return hvm_intblk_gif; + if ( (intack.source != hvm_intsrc_nmi) && !(guest_cpu_user_regs()->eflags & X86_EFLAGS_IF) ) return hvm_intblk_rflags_ie; + if ( nestedhvm_enabled(v->domain) && nestedhvm_vcpu_in_guestmode(v) ) { + if ( VCPU_NESTEDHVM(v).nh_hostflags.fields.vintrmask ) + if ( !VCPU_NESTEDHVM(v).nh_hostflags.fields.rflagsif ) + return hvm_intblk_rflags_ie; + } + intr_shadow = hvm_funcs.get_interrupt_shadow(v); if ( intr_shadow & (HVM_INTR_SHADOW_STI|HVM_INTR_SHADOW_MOV_SS) ) diff -r 11f96c916410 -r 5a68e35f53af xen/arch/x86/x86_32/asm-offsets.c --- a/xen/arch/x86/x86_32/asm-offsets.c +++ b/xen/arch/x86/x86_32/asm-offsets.c @@ -132,4 +132,7 @@ void __dummy__(void) OFFSET(MB_flags, multiboot_info_t, flags); OFFSET(MB_cmdline, multiboot_info_t, cmdline); + + OFFSET(NESTEDHVM_hostflags, struct vcpu, arch.hvm_vcpu.nestedhvm.nh_hostflags.bytes); + DEFINE(NESTEDHVM_forcevmexit, 0x4); } diff -r 11f96c916410 -r 5a68e35f53af xen/arch/x86/x86_64/asm-offsets.c --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -156,4 +156,7 @@ void __dummy__(void) OFFSET(MB_flags, multiboot_info_t, flags); OFFSET(MB_cmdline, multiboot_info_t, cmdline); + + OFFSET(NESTEDHVM_hostflags, struct vcpu, arch.hvm_vcpu.nestedhvm.nh_hostflags.bytes); + DEFINE(NESTEDHVM_forcevmexit, 0x4); } --Boundary-00=_kW9BMzrvodwORzR Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_kW9BMzrvodwORzR--