# HG changeset patch # User cegger # Date 1281003858 -7200 Handle interrupts (generic part) diff -r 8c7c597735c6 -r 1a1837336ffd xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2286,6 +2286,17 @@ enum hvm_intblk hvm_interrupt_blocked(st ASSERT(v == current); + if ( nestedhvm_enabled(v->domain) ) { + if ( !nestedsvm_gif_isset(v) ) + return hvm_intblk_gif; + + if ( 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; + } + } + if ( (intack.source != hvm_intsrc_nmi) && !(guest_cpu_user_regs()->eflags & X86_EFLAGS_IF) ) return hvm_intblk_rflags_ie; diff -r 8c7c597735c6 -r 1a1837336ffd 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 @@ -135,4 +135,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 8c7c597735c6 -r 1a1837336ffd 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 @@ -158,4 +158,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); }