* [PATCH] x86: kvm: avoid unused variable warning
@ 2018-08-20 21:37 Arnd Bergmann
2018-08-21 10:45 ` Paolo Bonzini
2018-08-22 11:51 ` David Hildenbrand
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2018-08-20 21:37 UTC (permalink / raw)
To: Paolo Bonzini, Radim Krčmář,
Thomas Gleixner, Ingo Molnar, x86
Cc: Arnd Bergmann, H. Peter Anvin, Wanpeng Li, David Hildenbrand,
Liran Alon, Christoffer Dall, kvm, linux-kernel
Removing one of the two accesses of the maxphyaddr variable led to
a harmless warning:
arch/x86/kvm/x86.c: In function 'kvm_set_mmio_spte_mask':
arch/x86/kvm/x86.c:6563:6: error: unused variable 'maxphyaddr' [-Werror=unused-variable]
Removing the #ifdef seems to be the nicest workaround, as it
makes the code look cleaner than adding another #ifdef.
Fixes: 28a1f3ac1d0c ("kvm: x86: Set highest physical address bits in non-present/reserved SPTEs")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/kvm/x86.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 4a74a7cf0a8b..506bd2b4b8bb 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6576,14 +6576,12 @@ static void kvm_set_mmio_spte_mask(void)
/* Set the present bit. */
mask |= 1ull;
-#ifdef CONFIG_X86_64
/*
* If reserved bit is not supported, clear the present bit to disable
* mmio page fault.
*/
- if (maxphyaddr == 52)
+ if (IS_ENABLED(CONFIG_X86_64) && maxphyaddr == 52)
mask &= ~1ull;
-#endif
kvm_mmu_set_mmio_spte_mask(mask, mask);
}
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] x86: kvm: avoid unused variable warning
2018-08-20 21:37 [PATCH] x86: kvm: avoid unused variable warning Arnd Bergmann
@ 2018-08-21 10:45 ` Paolo Bonzini
2018-08-22 11:51 ` David Hildenbrand
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2018-08-21 10:45 UTC (permalink / raw)
To: Arnd Bergmann, Radim Krčmář,
Thomas Gleixner, Ingo Molnar, x86
Cc: H. Peter Anvin, Wanpeng Li, David Hildenbrand, Liran Alon,
Christoffer Dall, kvm, linux-kernel
On 20/08/2018 23:37, Arnd Bergmann wrote:
> Removing one of the two accesses of the maxphyaddr variable led to
> a harmless warning:
>
> arch/x86/kvm/x86.c: In function 'kvm_set_mmio_spte_mask':
> arch/x86/kvm/x86.c:6563:6: error: unused variable 'maxphyaddr' [-Werror=unused-variable]
>
> Removing the #ifdef seems to be the nicest workaround, as it
> makes the code look cleaner than adding another #ifdef.
>
> Fixes: 28a1f3ac1d0c ("kvm: x86: Set highest physical address bits in non-present/reserved SPTEs")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/x86/kvm/x86.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 4a74a7cf0a8b..506bd2b4b8bb 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -6576,14 +6576,12 @@ static void kvm_set_mmio_spte_mask(void)
> /* Set the present bit. */
> mask |= 1ull;
>
> -#ifdef CONFIG_X86_64
> /*
> * If reserved bit is not supported, clear the present bit to disable
> * mmio page fault.
> */
> - if (maxphyaddr == 52)
> + if (IS_ENABLED(CONFIG_X86_64) && maxphyaddr == 52)
> mask &= ~1ull;
> -#endif
>
> kvm_mmu_set_mmio_spte_mask(mask, mask);
> }
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86: kvm: avoid unused variable warning
2018-08-20 21:37 [PATCH] x86: kvm: avoid unused variable warning Arnd Bergmann
2018-08-21 10:45 ` Paolo Bonzini
@ 2018-08-22 11:51 ` David Hildenbrand
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2018-08-22 11:51 UTC (permalink / raw)
To: Arnd Bergmann, Paolo Bonzini, Radim Krčmář,
Thomas Gleixner, Ingo Molnar, x86
Cc: H. Peter Anvin, Wanpeng Li, Liran Alon, Christoffer Dall, kvm,
linux-kernel
On 20.08.2018 23:37, Arnd Bergmann wrote:
> Removing one of the two accesses of the maxphyaddr variable led to
> a harmless warning:
>
> arch/x86/kvm/x86.c: In function 'kvm_set_mmio_spte_mask':
> arch/x86/kvm/x86.c:6563:6: error: unused variable 'maxphyaddr' [-Werror=unused-variable]
>
> Removing the #ifdef seems to be the nicest workaround, as it
> makes the code look cleaner than adding another #ifdef.
>
> Fixes: 28a1f3ac1d0c ("kvm: x86: Set highest physical address bits in non-present/reserved SPTEs")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/x86/kvm/x86.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 4a74a7cf0a8b..506bd2b4b8bb 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -6576,14 +6576,12 @@ static void kvm_set_mmio_spte_mask(void)
> /* Set the present bit. */
> mask |= 1ull;
>
> -#ifdef CONFIG_X86_64
> /*
> * If reserved bit is not supported, clear the present bit to disable
> * mmio page fault.
> */
> - if (maxphyaddr == 52)
> + if (IS_ENABLED(CONFIG_X86_64) && maxphyaddr == 52)
> mask &= ~1ull;
> -#endif
>
> kvm_mmu_set_mmio_spte_mask(mask, mask);
> }
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-22 11:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-20 21:37 [PATCH] x86: kvm: avoid unused variable warning Arnd Bergmann
2018-08-21 10:45 ` Paolo Bonzini
2018-08-22 11:51 ` David Hildenbrand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).