In the event of moving pvclock_pvti_cpu0_va() definition to common pvclock code, this function would return a value on non KVM guests. Later on this would fail with a GPF on ptp_kvm_init when running on a Xen guest. Therefore, ptp_kvm_init() should check whether it is running in a KVM guest.
Signed-off-by: Joao Martins joao.m.martins@oracle.com Acked-by: Radim Krčmář rkrcmar@redhat.com Signed-off-by: Boris Ostrovsky boris.ostrovsky@oracle.com Signed-off-by: Juergen Gross jgross@suse.com --- This is upstream commit 001f60e1f662a6dee1630a2915401aaf5959d479. Needed for upstream commit 867cefb4cb1012f42cada1c7d1f35ac8dd276071. --- drivers/ptp/ptp_kvm.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm.c index 2b1b212c219e..e04d7b2ecb3a 100644 --- a/drivers/ptp/ptp_kvm.c +++ b/drivers/ptp/ptp_kvm.c @@ -178,6 +178,9 @@ static int __init ptp_kvm_init(void) { long ret;
+ if (!kvm_para_available()) + return -ENODEV; + clock_pair_gpa = slow_virt_to_phys(&clock_pair); hv_clock = pvclock_pvti_cpu0_va();