|
 |
28c80a |
From 7e7cd720a64754c0ebe4b38b310ceef2fc839c64 Mon Sep 17 00:00:00 2001
|
|
|
28c80a |
From: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Date: Fri, 21 Dec 2018 15:39:49 +0100
|
|
|
28c80a |
Subject: [PATCH 05/14] s390x/tcg: drop tod_basetime
|
|
|
28c80a |
|
|
|
28c80a |
RH-Author: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Message-id: <20181221153957.28183-5-david@redhat.com>
|
|
|
28c80a |
Patchwork-id: 83768
|
|
|
28c80a |
O-Subject: [RHEL-7.6.z qemu-kvm-ma PATCH 04/12] s390x/tcg: drop tod_basetime
|
|
|
28c80a |
Bugzilla: 1672920
|
|
|
28c80a |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
28c80a |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
28c80a |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
28c80a |
|
|
|
28c80a |
Never set to anything but 0.
|
|
|
28c80a |
|
|
|
28c80a |
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
|
28c80a |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Message-Id: <20180627134410.4901-5-david@redhat.com>
|
|
|
28c80a |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
28c80a |
(cherry picked from commit f777b20544fe5db3de179a83374cbf9f1e454427)
|
|
|
28c80a |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
28c80a |
---
|
|
|
28c80a |
target/s390x/cpu.c | 1 -
|
|
|
28c80a |
target/s390x/cpu.h | 1 -
|
|
|
28c80a |
target/s390x/misc_helper.c | 4 ++--
|
|
|
28c80a |
3 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
28c80a |
|
|
|
28c80a |
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
|
|
|
28c80a |
index 167d089..5570741 100644
|
|
|
28c80a |
--- a/target/s390x/cpu.c
|
|
|
28c80a |
+++ b/target/s390x/cpu.c
|
|
|
28c80a |
@@ -290,7 +290,6 @@ static void s390_cpu_initfn(Object *obj)
|
|
|
28c80a |
qemu_get_timedate(&tm, 0);
|
|
|
28c80a |
env->tod_offset = TOD_UNIX_EPOCH +
|
|
|
28c80a |
(time2tod(mktimegm(&tm)) * 1000000000ULL);
|
|
|
28c80a |
- env->tod_basetime = 0;
|
|
|
28c80a |
env->tod_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu);
|
|
|
28c80a |
env->cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu);
|
|
|
28c80a |
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
|
|
|
28c80a |
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
|
|
|
28c80a |
index 67118c8..04f9adf 100644
|
|
|
28c80a |
--- a/target/s390x/cpu.h
|
|
|
28c80a |
+++ b/target/s390x/cpu.h
|
|
|
28c80a |
@@ -134,7 +134,6 @@ struct CPUS390XState {
|
|
|
28c80a |
#endif
|
|
|
28c80a |
|
|
|
28c80a |
uint64_t tod_offset;
|
|
|
28c80a |
- uint64_t tod_basetime;
|
|
|
28c80a |
QEMUTimer *tod_timer;
|
|
|
28c80a |
|
|
|
28c80a |
QEMUTimer *cpu_timer;
|
|
|
28c80a |
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
|
|
|
28c80a |
index e0b23c1..8b3b040 100644
|
|
|
28c80a |
--- a/target/s390x/misc_helper.c
|
|
|
28c80a |
+++ b/target/s390x/misc_helper.c
|
|
|
28c80a |
@@ -142,7 +142,7 @@ uint64_t HELPER(stck)(CPUS390XState *env)
|
|
|
28c80a |
uint64_t time;
|
|
|
28c80a |
|
|
|
28c80a |
time = env->tod_offset +
|
|
|
28c80a |
- time2tod(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - env->tod_basetime);
|
|
|
28c80a |
+ time2tod(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
|
|
|
28c80a |
|
|
|
28c80a |
return time;
|
|
|
28c80a |
}
|
|
|
28c80a |
@@ -162,7 +162,7 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t time)
|
|
|
28c80a |
/* nanoseconds */
|
|
|
28c80a |
time = tod2time(time);
|
|
|
28c80a |
|
|
|
28c80a |
- timer_mod(env->tod_timer, env->tod_basetime + time);
|
|
|
28c80a |
+ timer_mod(env->tod_timer, time);
|
|
|
28c80a |
}
|
|
|
28c80a |
|
|
|
28c80a |
/* Set Tod Programmable Field */
|
|
|
28c80a |
--
|
|
|
28c80a |
1.8.3.1
|
|
|
28c80a |
|