Move 'force_avic' module parameter from avic.c to svm.c so that all SVM module parameters are consolidated in a single place. No functional change. Signed-off-by: Naveen N Rao (AMD) --- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/svm/avic.c | 5 +---- arch/x86/kvm/svm/svm.c | 5 ++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index ec2e275829a6..d332930b3dae 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -802,7 +802,7 @@ extern struct kvm_x86_nested_ops svm_nested_ops; BIT(APICV_INHIBIT_REASON_PHYSICAL_ID_TOO_BIG) \ ) -void avic_hardware_setup(void); +void avic_hardware_setup(bool force_avic); int avic_ga_log_notifier(u32 ga_tag); void avic_vm_destroy(struct kvm *kvm); int avic_vm_init(struct kvm *kvm); diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 620583b2ddd1..9fe1fd709458 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -64,9 +64,6 @@ static_assert(__AVIC_GATAG(AVIC_VM_ID_MASK, AVIC_VCPU_IDX_MASK) == -1u); -static bool force_avic; -module_param_unsafe(force_avic, bool, 0444); - /* Note: * This hash table is used to map VM_ID to a struct kvm_svm, * when handling AMD IOMMU GALOG notification to schedule in @@ -1096,7 +1093,7 @@ void avic_vcpu_unblocking(struct kvm_vcpu *vcpu) * - Hypervisor can support both xAVIC and x2AVIC in the same guest. * - The mode can be switched at run-time. */ -void avic_hardware_setup(void) +void avic_hardware_setup(bool force_avic) { bool enable = false; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d5854e0bc799..b66fbfd47d4c 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -166,6 +166,9 @@ bool avic; module_param(avic, bool, 0444); module_param(enable_ipiv, bool, 0444); +static bool force_avic; +module_param_unsafe(force_avic, bool, 0444); + module_param(enable_device_posted_irqs, bool, 0444); bool __read_mostly dump_invalid_vmcb; @@ -5406,7 +5409,7 @@ static __init int svm_hardware_setup(void) goto err; } - avic_hardware_setup(); + avic_hardware_setup(force_avic); if (!enable_apicv) { enable_ipiv = false; -- 2.50.1