* [PATCH] xen: Use #defines instead of magic constants in vmx_vmcs_save()
@ 2014-08-05 9:57 Razvan Cojocaru
2014-08-05 12:04 ` Jan Beulich
0 siblings, 1 reply; 3+ messages in thread
From: Razvan Cojocaru @ 2014-08-05 9:57 UTC (permalink / raw)
To: xen-devel
Cc: kevin.tian, keir, jun.nakajima, Razvan Cojocaru, eddie.dong,
jbeulich
Now using a combination of INTR_INFO_VECTOR_MASK,
INTR_INFO_INTR_TYPE_MASK and MASK_EXTR() to replace the old
"(ev >> 8) & 7, ev & 0xff" magic constant code in vmx.c.
Signed-off-by: Razvan Cojocaru <rcojocaru@bitdefender.com>
---
xen/arch/x86/hvm/vmx/vmx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 2caa04a..278a7a7 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -434,7 +434,8 @@ static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c)
c->error_code = 0;
__vmread(VM_ENTRY_INTR_INFO, &ev);
if ( (ev & INTR_INFO_VALID_MASK) &&
- hvm_event_needs_reinjection((ev >> 8) & 7, ev & 0xff) )
+ hvm_event_needs_reinjection(MASK_EXTR(ev, INTR_INFO_INTR_TYPE_MASK),
+ ev & INTR_INFO_VECTOR_MASK) )
{
c->pending_event = ev;
__vmread(VM_ENTRY_EXCEPTION_ERROR_CODE, &ev);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] xen: Use #defines instead of magic constants in vmx_vmcs_save()
2014-08-05 9:57 [PATCH] xen: Use #defines instead of magic constants in vmx_vmcs_save() Razvan Cojocaru
@ 2014-08-05 12:04 ` Jan Beulich
2014-08-05 12:26 ` Razvan Cojocaru
0 siblings, 1 reply; 3+ messages in thread
From: Jan Beulich @ 2014-08-05 12:04 UTC (permalink / raw)
To: Razvan Cojocaru; +Cc: keir, kevin.tian, eddie.dong, jun.nakajima, xen-devel
>>> On 05.08.14 at 11:57, <rcojocaru@bitdefender.com> wrote:
> --- a/xen/arch/x86/hvm/vmx/vmx.c
> +++ b/xen/arch/x86/hvm/vmx/vmx.c
> @@ -434,7 +434,8 @@ static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c)
> c->error_code = 0;
> __vmread(VM_ENTRY_INTR_INFO, &ev);
> if ( (ev & INTR_INFO_VALID_MASK) &&
> - hvm_event_needs_reinjection((ev >> 8) & 7, ev & 0xff) )
> + hvm_event_needs_reinjection(MASK_EXTR(ev, INTR_INFO_INTR_TYPE_MASK),
> + ev & INTR_INFO_VECTOR_MASK) )
Broken indentation, but I guess I can fix this up while committing
unless the VMX maintainers dislike the change and don't give their
ack.
Jan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xen: Use #defines instead of magic constants in vmx_vmcs_save()
2014-08-05 12:04 ` Jan Beulich
@ 2014-08-05 12:26 ` Razvan Cojocaru
0 siblings, 0 replies; 3+ messages in thread
From: Razvan Cojocaru @ 2014-08-05 12:26 UTC (permalink / raw)
To: Jan Beulich; +Cc: eddie.dong, kevin.tian, keir, jun.nakajima, xen-devel
On 08/05/2014 03:04 PM, Jan Beulich wrote:
>>>> On 05.08.14 at 11:57, <rcojocaru@bitdefender.com> wrote:
>> --- a/xen/arch/x86/hvm/vmx/vmx.c
>> +++ b/xen/arch/x86/hvm/vmx/vmx.c
>> @@ -434,7 +434,8 @@ static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c)
>> c->error_code = 0;
>> __vmread(VM_ENTRY_INTR_INFO, &ev);
>> if ( (ev & INTR_INFO_VALID_MASK) &&
>> - hvm_event_needs_reinjection((ev >> 8) & 7, ev & 0xff) )
>> + hvm_event_needs_reinjection(MASK_EXTR(ev, INTR_INFO_INTR_TYPE_MASK),
>> + ev & INTR_INFO_VECTOR_MASK) )
>
> Broken indentation, but I guess I can fix this up while committing
> unless the VMX maintainers dislike the change and don't give their
> ack.
No worries, I've sent V2:
http://lists.xen.org/archives/html/xen-devel/2014-08/msg00471.html
Hope it's right this time.
Thanks,
Razvan Cojocaru
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-05 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-05 9:57 [PATCH] xen: Use #defines instead of magic constants in vmx_vmcs_save() Razvan Cojocaru
2014-08-05 12:04 ` Jan Beulich
2014-08-05 12:26 ` Razvan Cojocaru
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.