* [PATCH] KVM: VMX: remove duplicated declaration
@ 2016-12-22 22:13 Jan Dakinevich
2017-01-05 17:19 ` Radim Krčmář
0 siblings, 1 reply; 2+ messages in thread
From: Jan Dakinevich @ 2016-12-22 22:13 UTC (permalink / raw)
To: kvm; +Cc: Paolo Bonzini, Radim Krčmář, Jan Dakinevich
Declaration of VMX_VPID_EXTENT_SUPPORTED_MASK occures twice in the code.
Probably, it was happened after unsuccessful merge.
Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com>
---
arch/x86/kvm/vmx.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 24db5fb..8c4e9ea 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -132,12 +132,6 @@
#define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5
-#define VMX_VPID_EXTENT_SUPPORTED_MASK \
- (VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT | \
- VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT | \
- VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT | \
- VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT)
-
/*
* Hyper-V requires all of these, so mark them as supported even though
* they are just treated the same as all-context.
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: VMX: remove duplicated declaration
2016-12-22 22:13 [PATCH] KVM: VMX: remove duplicated declaration Jan Dakinevich
@ 2017-01-05 17:19 ` Radim Krčmář
0 siblings, 0 replies; 2+ messages in thread
From: Radim Krčmář @ 2017-01-05 17:19 UTC (permalink / raw)
To: Jan Dakinevich; +Cc: kvm, Paolo Bonzini
2016-12-23 01:13+0300, Jan Dakinevich:
> Declaration of VMX_VPID_EXTENT_SUPPORTED_MASK occures twice in the code.
> Probably, it was happened after unsuccessful merge.
Hm, looks even weirder: the deleted hunk was added by bcdde302b826
("KVM: nVMX: invvpid handling improvements") and then 16c2aec6a295
("KVM: nVMX: invvpid handling improvements") duplicated the define and
added the comment on top of it.
> Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com>
> ---
Applied to kvm/master, thanks.
> arch/x86/kvm/vmx.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 24db5fb..8c4e9ea 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -132,12 +132,6 @@
>
> #define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5
>
> -#define VMX_VPID_EXTENT_SUPPORTED_MASK \
> - (VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT | \
> - VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT | \
> - VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT | \
> - VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT)
> -
> /*
> * Hyper-V requires all of these, so mark them as supported even though
> * they are just treated the same as all-context.
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-05 17:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-22 22:13 [PATCH] KVM: VMX: remove duplicated declaration Jan Dakinevich
2017-01-05 17:19 ` Radim Krčmář
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox