[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PATCH v1 2/7] s390x/tcg: drop tod_basetime
From: |
David Hildenbrand |
Subject: |
[qemu-s390x] [PATCH v1 2/7] s390x/tcg: drop tod_basetime |
Date: |
Fri, 25 May 2018 13:37:03 +0200 |
Never set to anything but 0.
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/cpu.c | 1 -
target/s390x/cpu.h | 1 -
target/s390x/misc_helper.c | 4 ++--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 167d089722..557074165a 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -290,7 +290,6 @@ static void s390_cpu_initfn(Object *obj)
qemu_get_timedate(&tm, 0);
env->tod_offset = TOD_UNIX_EPOCH +
(time2tod(mktimegm(&tm)) * 1000000000ULL);
- env->tod_basetime = 0;
env->tod_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu);
env->cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu);
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index ac51c17fb4..4abfe88a3d 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -131,7 +131,6 @@ struct CPUS390XState {
#endif
uint64_t tod_offset;
- uint64_t tod_basetime;
QEMUTimer *tod_timer;
QEMUTimer *cpu_timer;
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 1f834f35ef..044ffc64c4 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -142,7 +142,7 @@ uint64_t HELPER(stck)(CPUS390XState *env)
uint64_t time;
time = env->tod_offset +
- time2tod(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - env->tod_basetime);
+ time2tod(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
return time;
}
@@ -162,7 +162,7 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t time)
/* nanoseconds */
time = tod2time(time);
- timer_mod(env->tod_timer, env->tod_basetime + time);
+ timer_mod(env->tod_timer, time);
}
/* Set Tod Programmable Field */
--
2.17.0
- [qemu-s390x] [PATCH v1 0/7] s390x: TOD refactoring + TCG CPU hotplug support, David Hildenbrand, 2018/05/25
- [qemu-s390x] [PATCH v1 2/7] s390x/tcg: drop tod_basetime,
David Hildenbrand <=
- [qemu-s390x] [PATCH v1 1/7] s390x/tod: factor out TOD into separate device, David Hildenbrand, 2018/05/25
- [qemu-s390x] [PATCH v1 4/7] s390x/tcg: SET CLOCK COMPARATOR can clear CKC interrupts, David Hildenbrand, 2018/05/25
- [qemu-s390x] [PATCH v1 3/7] s390x/tcg: properly implement the TOD, David Hildenbrand, 2018/05/25
- [qemu-s390x] [PATCH v1 5/7] s390x/tcg: implement SET CLOCK, David Hildenbrand, 2018/05/25
- [qemu-s390x] [PATCH v1 6/7] s390x/tcg: rearm the CKC timer during migration, David Hildenbrand, 2018/05/25
- [qemu-s390x] [PATCH v1 7/7] s390x/tcg: fix CPU hotplug with single-threaded TCG, David Hildenbrand, 2018/05/25