Commit 2cfd7b73 authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/kvm: use union tod_clock 



Use union tod_clock and get rid of the kvm specific struct
kvm_s390_tod_clock_ext which apparently was introduced for the same
purpose.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 169ceac4

arch/s390/kvm/kvm-s390.c

+9 −15
Original line number Diff line number Diff line
@@ -165,12 +165,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
	{ NULL }

};



struct kvm_s390_tod_clock_ext {

	__u8 epoch_idx;

	__u64 tod;

	__u8 reserved[7];

} __packed;



/* allow nested virtualization in KVM (if enabled by user space) */

static int nested;

module_param(nested, int, S_IRUGO);
@@ -1166,17 +1160,17 @@ static int kvm_s390_set_tod(struct kvm *kvm, struct kvm_device_attr *attr) 
static void kvm_s390_get_tod_clock(struct kvm *kvm,

				   struct kvm_s390_vm_tod_clock *gtod)

{

	struct kvm_s390_tod_clock_ext htod;

	union tod_clock clk;



	preempt_disable();



	get_tod_clock_ext((char *)&htod);

	store_tod_clock_ext(&clk);



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

	gtod->tod = clk.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 = clk.ei + kvm->arch.epdx;

		if (gtod->tod < clk.tod)

			gtod->epoch_idx += 1;

	}
@@ -3867,18 +3861,18 @@ void kvm_s390_set_tod_clock(struct kvm *kvm, 
			    const struct kvm_s390_vm_tod_clock *gtod)

{

	struct kvm_vcpu *vcpu;

	struct kvm_s390_tod_clock_ext htod;

	union tod_clock clk;

	int i;



	mutex_lock(&kvm->lock);

	preempt_disable();



	get_tod_clock_ext((char *)&htod);

	store_tod_clock_ext(&clk);



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

	kvm->arch.epoch = gtod->tod - clk.tod;

	kvm->arch.epdx = 0;

	if (test_kvm_facility(kvm, 139)) {

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

		kvm->arch.epdx = gtod->epoch_idx - clk.ei;

		if (kvm->arch.epoch > gtod->tod)

			kvm->arch.epdx -= 1;

	}