[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/10] target/s390x: Split out s390-tod.h
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 03/10] target/s390x: Split out s390-tod.h |
Date: |
Mon, 18 Feb 2019 12:11:46 +0100 |
From: Richard Henderson <address@hidden>
We will need these from CONFIG_USER_ONLY as well,
which cannot access include/hw/.
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
include/hw/s390x/tod.h | 16 +---------------
target/s390x/s390-tod.h | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 15 deletions(-)
create mode 100644 target/s390x/s390-tod.h
diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h
index 47ef9de869cc..9c4a6000c331 100644
--- a/include/hw/s390x/tod.h
+++ b/include/hw/s390x/tod.h
@@ -12,6 +12,7 @@
#define HW_S390_TOD_H
#include "hw/qdev.h"
+#include "s390-tod.h"
typedef struct S390TOD {
uint8_t high;
@@ -50,21 +51,6 @@ typedef struct S390TODClass {
void (*set)(S390TODState *td, const S390TOD *tod, Error **errp);
} S390TODClass;
-/* The value of the TOD clock for 1.1.1970. */
-#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL
-
-/* Converts ns to s390's clock format */
-static inline uint64_t time2tod(uint64_t ns)
-{
- return (ns << 9) / 125 + (((ns & 0xff80000000000000ull) / 125) << 9);
-}
-
-/* Converts s390's clock format to ns */
-static inline uint64_t tod2time(uint64_t t)
-{
- return ((t >> 9) * 125) + (((t & 0x1ff) * 125) >> 9);
-}
-
void s390_init_tod(void);
S390TODState *s390_get_todstate(void);
diff --git a/target/s390x/s390-tod.h b/target/s390x/s390-tod.h
new file mode 100644
index 000000000000..8b74d6a6d886
--- /dev/null
+++ b/target/s390x/s390-tod.h
@@ -0,0 +1,29 @@
+/*
+ * TOD (Time Of Day) clock
+ *
+ * Copyright 2018 Red Hat, Inc.
+ * Author(s): David Hildenbrand <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef TARGET_S390_TOD_H
+#define TARGET_S390_TOD_H
+
+/* The value of the TOD clock for 1.1.1970. */
+#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL
+
+/* Converts ns to s390's clock format */
+static inline uint64_t time2tod(uint64_t ns)
+{
+ return (ns << 9) / 125 + (((ns & 0xff80000000000000ull) / 125) << 9);
+}
+
+/* Converts s390's clock format to ns */
+static inline uint64_t tod2time(uint64_t t)
+{
+ return ((t >> 9) * 125) + (((t & 0x1ff) * 125) >> 9);
+}
+
+#endif
--
2.17.2
- [Qemu-devel] [PULL 05/10] s390x/pci: mark zpci devices as unmigratable, (continued)
- [Qemu-devel] [PULL 05/10] s390x/pci: mark zpci devices as unmigratable, Cornelia Huck, 2019/02/05
- [Qemu-devel] [PULL 04/10] s390x/pci: Drop release timer and replace it with a flag, Cornelia Huck, 2019/02/05
- [Qemu-devel] [PULL 07/10] s390x/pci: Fix primary bus number for PCI bridges, Cornelia Huck, 2019/02/05
- [Qemu-devel] [PULL 06/10] s390x/tcg: Don't model FP registers as globals, Cornelia Huck, 2019/02/05
- [Qemu-devel] [PULL 08/10] s390x/pci: Fix hotplugging of PCI bridges, Cornelia Huck, 2019/02/05
- [Qemu-devel] [PULL 09/10] s390x/pci: Warn when adding PCI devices without the 'zpci' feature, Cornelia Huck, 2019/02/05
- [Qemu-devel] [PULL 10/10] s390x/pci: Unplug remaining requested devices on pcihost reset, Cornelia Huck, 2019/02/05
- Re: [Qemu-devel] [PULL 00/10] s390x update, Peter Maydell, 2019/02/05
- [Qemu-devel] [PULL 00/10] s390x update, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 01/10] s390x: Fix the confusing contributions-after-2012 license statements, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 03/10] target/s390x: Split out s390-tod.h,
Cornelia Huck <=
- [Qemu-devel] [PULL 02/10] s390x: always provide pci support, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 04/10] target/s390x: Implement STCK et al for CONFIG_USER_ONLY, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 05/10] s390x: add zPCI feature to "qemu" CPU model, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 06/10] s390x/cpumodel: mepochptff: warn when no mepoch and re-align group init, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 07/10] s390x/cpumodel: default enable mepoch for z14 and later, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 08/10] s390x/cpumodel: add z14 GA2 model, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 09/10] s390x/kvm: add tracepoint to ioeventfd interface, Cornelia Huck, 2019/02/18
- [Qemu-devel] [PULL 10/10] s390x: upgrade status of KVM cores to "supported", Cornelia Huck, 2019/02/18
- Re: [Qemu-devel] [PULL 00/10] s390x update, no-reply, 2019/02/18
- Re: [Qemu-devel] [PULL 00/10] s390x update, no-reply, 2019/02/18