| Message ID | 20180820213808.2258428-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 7288bde1f9df6c1475675419bdd7725ce84dec56 |
| Headers | show |
| Series | x86: kvm: avoid unused variable warning | expand |
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
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
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); }
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(-) -- 2.18.0