Commit 2333afa1 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Drop superfluous __KVM_VCPU_MULTIPLE_ADDRESS_SPACE macro 



Drop __KVM_VCPU_MULTIPLE_ADDRESS_SPACE and instead check the value of
KVM_ADDRESS_SPACE_NUM.

No functional change intended.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Message-Id: <20231027182217.3615211-22-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8dd2eee9

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -2136,7 +2136,6 @@ enum { 
#define HF_SMM_MASK		(1 << 1)

#define HF_SMM_INSIDE_NMI_MASK	(1 << 2)



# define __KVM_VCPU_MULTIPLE_ADDRESS_SPACE

# define KVM_ADDRESS_SPACE_NUM 2

# define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0)

# define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm)

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ bool kvm_arch_irqchip_in_kernel(struct kvm *kvm); 
#define KVM_MEM_SLOTS_NUM SHRT_MAX

#define KVM_USER_MEM_SLOTS (KVM_MEM_SLOTS_NUM - KVM_INTERNAL_MEM_SLOTS)



#ifndef __KVM_VCPU_MULTIPLE_ADDRESS_SPACE

#if KVM_ADDRESS_SPACE_NUM == 1

static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu)

{

	return 0;