diff options
| author | Peter Maydell | 2018-12-20 21:39:04 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-12-20 21:39:04 +0100 |
| commit | 41e2c56ed95db328a4e24c5756312c0158de71ce (patch) | |
| tree | 18c78c0c5dc66dd3f89a6bbb1c5c6569e8f475ec /include | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-12-20' into ... (diff) | |
| parent | hw/s390x: Fix bad mask in time2tod() (diff) | |
| download | qemu-41e2c56ed95db328a4e24c5756312c0158de71ce.tar.gz qemu-41e2c56ed95db328a4e24c5756312c0158de71ce.tar.xz qemu-41e2c56ed95db328a4e24c5756312c0158de71ce.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181220' into staging
Two s390x bugfixes.
# gpg: Signature made Thu 20 Dec 2018 16:36:42 GMT
# gpg: using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20181220:
hw/s390x: Fix bad mask in time2tod()
hw/s390/ccw.c: Don't take address of packed members
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -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 */ |