Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33d1b272 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: generalize kvm_s390_get_tod_clock_ext() 



Move the Multiple-epoch facility handling into it and rename it to
kvm_s390_get_tod_clock().

This leaves us with:
- kvm_s390_set_tod_clock()
- kvm_s390_get_tod_clock()
- kvm_s390_get_tod_clock_fast()

So all Multiple-epoch facility is hidden in these functions.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCollin Walling <walling@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 9ac96d75

arch/s390/kvm/kvm-s390.c

+9 −12
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static int kvm_s390_set_tod(struct kvm *kvm, struct kvm_device_attr *attr) 
	return ret;

}



static void kvm_s390_get_tod_clock_ext(struct kvm *kvm,

static void kvm_s390_get_tod_clock(struct kvm *kvm,

				   struct kvm_s390_vm_tod_clock *gtod)

{

	struct kvm_s390_tod_clock_ext htod;
@@ -1050,10 +1050,12 @@ static void kvm_s390_get_tod_clock_ext(struct kvm *kvm, 
	get_tod_clock_ext((char *)&htod);



	gtod->tod = htod.tod + kvm->arch.epoch;

	gtod->epoch_idx = 0;

	if (test_kvm_facility(kvm, 139)) {

		gtod->epoch_idx = htod.epoch_idx + kvm->arch.epdx;



		if (gtod->tod < htod.tod)

			gtod->epoch_idx += 1;

	}



	preempt_enable();

}
@@ -1063,12 +1065,7 @@ static int kvm_s390_get_tod_ext(struct kvm *kvm, struct kvm_device_attr *attr) 
	struct kvm_s390_vm_tod_clock gtod;



	memset(&gtod, 0, sizeof(gtod));



	if (test_kvm_facility(kvm, 139))

		kvm_s390_get_tod_clock_ext(kvm, &gtod);

	else

		gtod.tod = kvm_s390_get_tod_clock_fast(kvm);



	kvm_s390_get_tod_clock(kvm, &gtod);

	if (copy_to_user((void __user *)attr->addr, &gtod, sizeof(gtod)))

		return -EFAULT;