| Message ID | 20200623115816.24132-8-xiaoyao.li@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Refactor handling flow of SET_CPUID* | expand |
On Tue, Jun 23, 2020 at 07:58:16PM +0800, Xiaoyao Li wrote: > Obviously, kvm_apic_set_version() fits well in kvm_update_vcpu_model(). Same as the last patch, it would be nice to explicitly document that there are no dependencies between kvm_apic_set_version() and kvm_update_cpuid(). > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > arch/x86/kvm/cpuid.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 5decc2dd5448..3428f4d84b42 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -129,6 +129,8 @@ void kvm_update_vcpu_model(struct kvm_vcpu *vcpu) > apic->lapic_timer.timer_mode_mask = 3 << 17; > else > apic->lapic_timer.timer_mode_mask = 1 << 17; > + > + kvm_apic_set_version(vcpu); > } > > best = kvm_find_cpuid_entry(vcpu, 0xD, 0); > @@ -226,7 +228,6 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, > } > > cpuid_fix_nx_cap(vcpu); > - kvm_apic_set_version(vcpu); > kvm_update_cpuid(vcpu); > kvm_update_vcpu_model(vcpu); > > @@ -255,7 +256,6 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, > goto out; > } > > - kvm_apic_set_version(vcpu); > kvm_update_cpuid(vcpu); > kvm_update_vcpu_model(vcpu); > out: > -- > 2.18.2 >
On 7/3/2020 3:00 AM, Sean Christopherson wrote: > On Tue, Jun 23, 2020 at 07:58:16PM +0800, Xiaoyao Li wrote: >> Obviously, kvm_apic_set_version() fits well in kvm_update_vcpu_model(). > > Same as the last patch, it would be nice to explicitly document that there > are no dependencies between kvm_apic_set_version() and kvm_update_cpuid(). Sure, will do. Thanks! >> Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> >> --- >> arch/x86/kvm/cpuid.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c >> index 5decc2dd5448..3428f4d84b42 100644 >> --- a/arch/x86/kvm/cpuid.c >> +++ b/arch/x86/kvm/cpuid.c >> @@ -129,6 +129,8 @@ void kvm_update_vcpu_model(struct kvm_vcpu *vcpu) >> apic->lapic_timer.timer_mode_mask = 3 << 17; >> else >> apic->lapic_timer.timer_mode_mask = 1 << 17; >> + >> + kvm_apic_set_version(vcpu); >> } >> >> best = kvm_find_cpuid_entry(vcpu, 0xD, 0); >> @@ -226,7 +228,6 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, >> } >> >> cpuid_fix_nx_cap(vcpu); >> - kvm_apic_set_version(vcpu); >> kvm_update_cpuid(vcpu); >> kvm_update_vcpu_model(vcpu); >> >> @@ -255,7 +256,6 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, >> goto out; >> } >> >> - kvm_apic_set_version(vcpu); >> kvm_update_cpuid(vcpu); >> kvm_update_vcpu_model(vcpu); >> out: >> -- >> 2.18.2 >>
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 5decc2dd5448..3428f4d84b42 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -129,6 +129,8 @@ void kvm_update_vcpu_model(struct kvm_vcpu *vcpu) apic->lapic_timer.timer_mode_mask = 3 << 17; else apic->lapic_timer.timer_mode_mask = 1 << 17; + + kvm_apic_set_version(vcpu); } best = kvm_find_cpuid_entry(vcpu, 0xD, 0); @@ -226,7 +228,6 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, } cpuid_fix_nx_cap(vcpu); - kvm_apic_set_version(vcpu); kvm_update_cpuid(vcpu); kvm_update_vcpu_model(vcpu); @@ -255,7 +256,6 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, goto out; } - kvm_apic_set_version(vcpu); kvm_update_cpuid(vcpu); kvm_update_vcpu_model(vcpu); out:
Obviously, kvm_apic_set_version() fits well in kvm_update_vcpu_model(). Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> --- arch/x86/kvm/cpuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)