| Message ID | 20181130192216.26987-2-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/s390x: Implement STCK et al for CONFIG_USER_ONLY | expand |
On 2018-11-30 20:22, Richard Henderson wrote: > We will need this from CONFIG_USER_ONLY as well, > which cannot access include/hw/. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/hw/s390x/tod.h | 3 --- > target/s390x/cpu.h | 3 +++ > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h > index 413c0d7c02..6ec4fb426c 100644 > --- a/include/hw/s390x/tod.h > +++ b/include/hw/s390x/tod.h > @@ -44,9 +44,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) > { > diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h > index 8c2320e882..d8049d181a 100644 > --- a/target/s390x/cpu.h > +++ b/target/s390x/cpu.h > @@ -797,4 +797,7 @@ void s390_init_sigp(void); > /* outside of target/s390x/ */ > S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); > > +/* The value of the TOD clock for 1.1.1970. */ > +#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL > + > #endif > Reviewed-by: Thomas Huth <thuth@redhat.com>
On 30.11.18 20:22, Richard Henderson wrote: > We will need this from CONFIG_USER_ONLY as well, > which cannot access include/hw/. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/hw/s390x/tod.h | 3 --- > target/s390x/cpu.h | 3 +++ > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h > index 413c0d7c02..6ec4fb426c 100644 > --- a/include/hw/s390x/tod.h > +++ b/include/hw/s390x/tod.h > @@ -44,9 +44,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) > { > diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h > index 8c2320e882..d8049d181a 100644 > --- a/target/s390x/cpu.h > +++ b/target/s390x/cpu.h > @@ -797,4 +797,7 @@ void s390_init_sigp(void); > /* outside of target/s390x/ */ > S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); > > +/* The value of the TOD clock for 1.1.1970. */ > +#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL > + > #endif > As said in response to patch 2, this might not be needed. If you're going to stick to it Reviewed-by: David Hildenbrand <david@redhat.com> -- Thanks, David / dhildenb
diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h index 413c0d7c02..6ec4fb426c 100644 --- a/include/hw/s390x/tod.h +++ b/include/hw/s390x/tod.h @@ -44,9 +44,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) { diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 8c2320e882..d8049d181a 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -797,4 +797,7 @@ void s390_init_sigp(void); /* outside of target/s390x/ */ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); +/* The value of the TOD clock for 1.1.1970. */ +#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL + #endif
We will need this from CONFIG_USER_ONLY as well, which cannot access include/hw/. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/hw/s390x/tod.h | 3 --- target/s390x/cpu.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.17.2