| Message ID | 1438977210-24787-2-git-send-email-wei@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 07, 2015 at 03:53:29PM -0400, Wei Huang wrote: > Instead of being defined in a common header file, the kvm_pmu_ops struct > is arch (vmx/svm) specific. This trivial patch relocates two extern > variable definition to their arch-specific files. > > Signed-off-by: Wei Huang <wei@redhat.com> > --- > arch/x86/kvm/pmu.h | 2 -- > arch/x86/kvm/svm.c | 1 + > arch/x86/kvm/vmx.c | 1 + > 3 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h > index f96e1f9..95184fd 100644 > --- a/arch/x86/kvm/pmu.h > +++ b/arch/x86/kvm/pmu.h > @@ -113,6 +113,4 @@ void kvm_pmu_reset(struct kvm_vcpu *vcpu); > void kvm_pmu_init(struct kvm_vcpu *vcpu); > void kvm_pmu_destroy(struct kvm_vcpu *vcpu); > > -extern struct kvm_pmu_ops intel_pmu_ops; > -extern struct kvm_pmu_ops amd_pmu_ops; > #endif /* __KVM_X86_PMU_H */ > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index 8e0c084..8abf980 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -4452,6 +4452,7 @@ static void svm_sched_in(struct kvm_vcpu *vcpu, int cpu) > { > } > > +extern struct kvm_pmu_ops amd_pmu_ops; > static struct kvm_x86_ops svm_x86_ops = { > .cpu_has_kvm_support = has_svm, > .disabled_by_bios = is_disabled, > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 83b7b5c..6b2419d 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -10302,6 +10302,7 @@ static void vmx_enable_log_dirty_pt_masked(struct kvm *kvm, > kvm_mmu_clear_dirty_pt_masked(kvm, memslot, offset, mask); > } > > +extern struct kvm_pmu_ops intel_pmu_ops; > static struct kvm_x86_ops vmx_x86_ops = { > .cpu_has_kvm_support = cpu_has_kvm_support, > .disabled_by_bios = vmx_disabled_by_bios, > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Andrew Jones <drjones@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h index f96e1f9..95184fd 100644 --- a/arch/x86/kvm/pmu.h +++ b/arch/x86/kvm/pmu.h @@ -113,6 +113,4 @@ void kvm_pmu_reset(struct kvm_vcpu *vcpu); void kvm_pmu_init(struct kvm_vcpu *vcpu); void kvm_pmu_destroy(struct kvm_vcpu *vcpu); -extern struct kvm_pmu_ops intel_pmu_ops; -extern struct kvm_pmu_ops amd_pmu_ops; #endif /* __KVM_X86_PMU_H */ diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 8e0c084..8abf980 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4452,6 +4452,7 @@ static void svm_sched_in(struct kvm_vcpu *vcpu, int cpu) { } +extern struct kvm_pmu_ops amd_pmu_ops; static struct kvm_x86_ops svm_x86_ops = { .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 83b7b5c..6b2419d 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -10302,6 +10302,7 @@ static void vmx_enable_log_dirty_pt_masked(struct kvm *kvm, kvm_mmu_clear_dirty_pt_masked(kvm, memslot, offset, mask); } +extern struct kvm_pmu_ops intel_pmu_ops; static struct kvm_x86_ops vmx_x86_ops = { .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios,
Instead of being defined in a common header file, the kvm_pmu_ops struct is arch (vmx/svm) specific. This trivial patch relocates two extern variable definition to their arch-specific files. Signed-off-by: Wei Huang <wei@redhat.com> --- arch/x86/kvm/pmu.h | 2 -- arch/x86/kvm/svm.c | 1 + arch/x86/kvm/vmx.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-)