diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-09-01 14:58:00 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2021-09-06 16:25:27 +0200 |
| commit | ed3288ff8f8aab9b6602484dfcc09d5b59fb84fc (patch) | |
| tree | edc46a1a31c2ad1fa126ecfef2264f2e6ba73b7b /hw/s390x/sclp.c | |
| parent | c35622387efe39214ccd14fab0f280b6c53f1654 (diff) | |
| download | qemu-ed3288ff8f8aab9b6602484dfcc09d5b59fb84fc.zip qemu-ed3288ff8f8aab9b6602484dfcc09d5b59fb84fc.tar.gz qemu-ed3288ff8f8aab9b6602484dfcc09d5b59fb84fc.tar.bz2 | |
s390x: Replace PAGE_SIZE, PAGE_SHIFT and PAGE_MASK
The PAGE_SIZE macro is causing trouble on Alpine Linux since it
clashes with a macro from a system header there. We already have
the TARGET_PAGE_SIZE, TARGET_PAGE_MASK and TARGET_PAGE_BITS macros
in QEMU anyway, so let's simply replace the PAGE_SIZE, PAGE_MASK
and PAGE_SHIFT macro with their TARGET_* counterparts.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/572
Message-Id: <20210901125800.611183-1-thuth@redhat.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/s390x/sclp.c')
| -rw-r--r-- | hw/s390x/sclp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index edb6e3e..89c30a8 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -51,7 +51,7 @@ static bool sccb_verify_boundary(uint64_t sccb_addr, uint16_t sccb_len, uint32_t code) { uint64_t sccb_max_addr = sccb_addr + sccb_len - 1; - uint64_t sccb_boundary = (sccb_addr & PAGE_MASK) + PAGE_SIZE; + uint64_t sccb_boundary = (sccb_addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE; switch (code & SCLP_CMD_CODE_MASK) { case SCLP_CMDW_READ_SCP_INFO: |