diff options
| author | Thomas Huth <thuth@redhat.com> | 2018-12-14 14:08:07 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2018-12-20 17:07:24 +0100 |
| commit | aba7a5a2de3dba5917024df25441f715b9249e31 (patch) | |
| tree | 4b7d9a15d0e11b8861b1ca7c0cf5fb546b968d3a | |
| parent | 55281a2c53b884d0c2bce31aee592faf20a28eed (diff) | |
| download | qemu-aba7a5a2de3dba5917024df25441f715b9249e31.zip | |
hw/s390x: Fix bad mask in time2tod()
Since "s390x/tcg: avoid overflows in time2tod/tod2time", the
time2tod() function tries to deal with the 9 uppermost bits in the
time value, but uses the wrong mask for this: 0xff80000000000000 should
be used instead of 0xff10000000000000 here.
Fixes: 14055ce53c2d901d826ffad7fb7d6bb8ab46bdfd
Cc: qemu-stable@nongnu.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1544792887-14575-1-git-send-email-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
[CH: tweaked commit message]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | include/hw/s390x/tod.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h index cbd7552e7a..47ef9de869 100644 --- a/include/hw/s390x/tod.h +++ b/include/hw/s390x/tod.h @@ -56,7 +56,7 @@ typedef struct S390TODClass { /* Converts ns to s390's clock format */ static inline uint64_t time2tod(uint64_t ns) { - return (ns << 9) / 125 + (((ns & 0xff10000000000000ull) / 125) << 9); + return (ns << 9) / 125 + (((ns & 0xff80000000000000ull) / 125) << 9); } /* Converts s390's clock format to ns */ |