From 76dfca00588aeb71d85bac7ee0e2cf89df0d5b15 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Fri, 21 Dec 2018 15:36:06 +0000 Subject: [PATCH 04/22] s390x/tcg: drop tod_basetime RH-Author: David Hildenbrand Message-id: <20181221153614.27961-5-david@redhat.com> Patchwork-id: 83747 O-Subject: [RHEL-8.0 qemu-kvm v2 PATCH 04/12] s390x/tcg: drop tod_basetime Bugzilla: 1653569 RH-Acked-by: Cornelia Huck RH-Acked-by: Thomas Huth RH-Acked-by: Laurent Vivier Never set to anything but 0. Reviewed-by: Thomas Huth Signed-off-by: David Hildenbrand Message-Id: <20180627134410.4901-5-david@redhat.com> Signed-off-by: Cornelia Huck (cherry picked from commit f777b20544fe5db3de179a83374cbf9f1e454427) Signed-off-by: David Hildenbrand Signed-off-by: Danilo C. L. de Paula --- 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 167d089..5570741 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 67118c8..04f9adf 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -134,7 +134,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 e0b23c1..8b3b040 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 */ -- 1.8.3.1