semantic conflict between tip and kvm (was Re: linux-next: Signed-off-by missing for commit in the kvm tree)

[Paolo Bonzini]

On 06/08/2018 23:39, Stephen Rothwell wrote:
> Hi all,
> 
> Commit
> 
>   81781b6884bd ("KVM/x86: Use CC_SET()/CC_OUT in arch/x86/kvm/vmx.c")
> 
> is missing a Signed-off-by from its committer.
> 

Stephen,

there is a semantic conflict between tip and kvm:

const __initconst struct hypervisor_x86 x86_hyper_kvm = {
        .name                   = "KVM",
        .detect                 = kvm_detect,
        .type                   = X86_HYPER_KVM,
        .init.init_platform     = kvmclock_init,
        .init.guest_late_init   = kvm_guest_init,
        .init.x2apic_available  = kvm_para_available,
        .init.init_platform     = kvm_init_platform,
};

Note that .init.init_platform is initialized twice.

The right fix is to keep the kvm version, and add a kvmclock_init() call
to kvm_init_platform.

Thanks,

Paolo

signature.asc
Description: OpenPGP digital signature