[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/9] accel/kvm: avoid using predefined PAGE_SIZE
From: |
Jiaxun Yang |
Subject: |
[PATCH 7/9] accel/kvm: avoid using predefined PAGE_SIZE |
Date: |
Mon, 21 Dec 2020 08:53:16 +0800 |
As per POSIX specification of limits.h [1], OS libc may define
PAGE_SIZE in limits.h.
To prevent collosion of definition, we discard PAGE_SIZE from
defined by libc and take QEMU's variable.
[1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
accel/kvm/kvm-all.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 389eaace72..3feb17d965 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -58,6 +58,9 @@
/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We
* need to use the real host PAGE_SIZE, as that's what KVM will use.
*/
+#ifdef PAGE_SIZE
+#undef PAGE_SIZE
+#endif
#define PAGE_SIZE qemu_real_host_page_size
//#define DEBUG_KVM
--
2.29.2
- Re: [PATCH 0/9] Alpine Linux build fix and CI pipeline, (continued)
- [PATCH 1/9] tests/docker: Add dockerfile for Alpine Linux, Jiaxun Yang, 2020/12/20
- [PATCH 2/9] configure: Add sys/timex.h to probe clk_adjtime, Jiaxun Yang, 2020/12/20
- [PATCH 3/9] configure/meson: Only check sys/signal.h on non-Linux, Jiaxun Yang, 2020/12/20
- [PATCH 4/9] libvhost-user: Include poll.h instead of sys/poll.h, Jiaxun Yang, 2020/12/20
- [PATCH 5/9] elf2dmp: Rename PAGE_SIZE to ELF2DMP_PAGE_SIZE, Jiaxun Yang, 2020/12/20
- [PATCH 6/9] hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE, Jiaxun Yang, 2020/12/20
- [PATCH 8/9] tests: Rename PAGE_SIZE definitions, Jiaxun Yang, 2020/12/20
- [PATCH 9/9] gitlab-ci: Add alpine to pipeline, Jiaxun Yang, 2020/12/20
- [PATCH 7/9] accel/kvm: avoid using predefined PAGE_SIZE,
Jiaxun Yang <=