Re: [Xen-devel] [PATCH] VMX: replace some plain numbers

["Li, Liang Z" <liang.z.li@xxxxxxxxx>]

Sorry, invalid patch, Please ignore this.


>  xen/arch/x86/hvm/vmx/vmx.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
> index 6c4f78c..5e90027 100644
> --- a/xen/arch/x86/hvm/vmx/vmx.c
> +++ b/xen/arch/x86/hvm/vmx/vmx.c
> @@ -2628,8 +2628,9 @@ static void vmx_idtv_reinject(unsigned long
> idtv_info)
>           * Clear NMI-blocking interruptibility info if an NMI delivery 
> faulted.
>           * Re-delivery will re-set it (see SDM 3B 25.7.1.2).
>           */
> -        if ( cpu_has_vmx_vnmi && ((idtv_info & INTR_INFO_INTR_TYPE_MASK)
> ==
> -                                 (X86_EVENTTYPE_NMI<<8)) )
> +        if ( cpu_has_vmx_vnmi &&
> +             ((idtv_info & INTR_INFO_INTR_TYPE_MASK) ==
> +              MASK_INSR(X86_EVENTTYPE_NMI, INTR_INFO_INTR_TYPE_MASK)) )
>          {
>              unsigned long intr_info;
> 
> @@ -2705,9 +2706,9 @@ void vmx_vmexit_handler(struct cpu_user_regs
> *regs)
>          vector = intr_info & INTR_INFO_VECTOR_MASK;
>          if ( vector == TRAP_machine_check )
>              do_machine_check(regs);
> -        if ( vector == TRAP_nmi
> -             && ((intr_info & INTR_INFO_INTR_TYPE_MASK) ==
> -                 (X86_EVENTTYPE_NMI << 8)) )
> +        if ( (vector == TRAP_nmi) &&
> +             ((intr_info & INTR_INFO_INTR_TYPE_MASK) ==
> +              MASK_INSR(X86_EVENTTYPE_EXT_INTR,
> + INTR_INFO_INTR_TYPE_MASK)) )
>          {
>              exception_table[TRAP_nmi](regs);
>              enable_nmis();
> --
> 1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel