Commit 7288bde1 authored Aug 20, 2018 by Arnd Bergmann Committed by Paolo Bonzini Aug 22, 2018

x86: kvm: avoid unused variable warning



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: 28a1f3ac ("kvm: x86: Set highest physical address bits in non-present/reserved SPTEs")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: stable@vger.kernel.org # L1TF
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 688e0581

arch/x86/kvm/x86.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -6576,14 +6576,12 @@ static void kvm_set_mmio_spte_mask(void)
	/* Set the present bit. */		/* Set the present bit. */
	mask \|= 1ull;		mask \|= 1ull;

	#ifdef CONFIG_X86_64
	/*		/*
	* If reserved bit is not supported, clear the present bit to disable		* If reserved bit is not supported, clear the present bit to disable
	* mmio page fault.		* mmio page fault.
	*/		*/
	if (maxphyaddr == 52)		if (IS_ENABLED(CONFIG_X86_64) && maxphyaddr == 52)
	mask &= ~1ull;		mask &= ~1ull;
	#endif

	kvm_mmu_set_mmio_spte_mask(mask, mask);		kvm_mmu_set_mmio_spte_mask(mask, mask);
	}		}