[v2] VMX: replace some plain numbers

[v2] VMX: replace some plain numbers

[Liang Li]

... making the code better document itself. No functional change
intended.

Signed-off-by: Liang Li <liang.z.li@intel.com>
---
 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..892a3bc 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_NMI, INTR_INFO_INTR_TYPE_MASK)) )
         {
             exception_table[TRAP_nmi](regs);
             enable_nmis();
-- 
1.9.1

Re: [v2] VMX: replace some plain numbers

[Jan Beulich]

>>> On 16.04.15 at 22:49, <liang.z.li@intel.com> wrote:
> ... making the code better document itself. No functional change
> intended.
> 
> Signed-off-by: Liang Li <liang.z.li@intel.com>
> ---

>From looking at it I can't see what the difference to v1 is, and you
also don't say anything in that regard here.

Jan

Re: [v2] VMX: replace some plain numbers

[Li, Liang Z]

> 
> >>> On 16.04.15 at 22:49, <liang.z.li@intel.com> wrote:
> > ... making the code better document itself. No functional change
> > intended.
> >
> > Signed-off-by: Liang Li <liang.z.li@intel.com>
> > ---
> 
> From looking at it I can't see what the difference to v1 is, and you also don't
> say anything in that regard here.
> 
> Jan

In v1, the 'X86_EVENTTYPE_EXT_INTR' is used instead of 'X86_EVENTTYPE_NMI', and it's wrong ...
I didn't found that at first.

Liang

Re: [v2] VMX: replace some plain numbers

[Tian, Kevin]

> From: Li, Liang Z
> Sent: Friday, April 17, 2015 4:50 AM
> 
> ... making the code better document itself. No functional change
> intended.
> 
> Signed-off-by: Liang Li <liang.z.li@intel.com>

Acked-by: Kevin Tian <kevin.tian@intel.com>

> ---
>  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..892a3bc 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_NMI,
> INTR_INFO_INTR_TYPE_MASK)) )
>          {
>              exception_table[TRAP_nmi](regs);
>              enable_nmis();
> --
> 1.9.1