[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/14] accel/kvm: avoid using predefined PAGE_SIZE
From: |
Thomas Huth |
Subject: |
[PULL 07/14] accel/kvm: avoid using predefined PAGE_SIZE |
Date: |
Wed, 20 Jan 2021 16:17:44 +0100 |
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
As per POSIX specification of limits.h [1], OS libc may define
PAGE_SIZE in limits.h.
PAGE_SIZE is used in included kernel uapi headers.
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>
Message-Id: <20210118063808.12471-8-jiaxun.yang@flygoat.com>
Signed-off-by: Thomas Huth <thuth@redhat.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.27.0
- [PULL 00/14] gitlab-CI, qtests and misc patches, Thomas Huth, 2021/01/20
- [PULL 06/14] tests: Rename PAGE_SIZE definitions, Thomas Huth, 2021/01/20
- [PULL 07/14] accel/kvm: avoid using predefined PAGE_SIZE,
Thomas Huth <=
- [PULL 09/14] tests/check-block.sh: Refuse to run the iotests with BusyBox' sed, Thomas Huth, 2021/01/20
- [PULL 01/14] osdep.h: Remove <sys/signal.h> include, Thomas Huth, 2021/01/20
- [PULL 03/14] libvhost-user: Include poll.h instead of sys/poll.h, Thomas Huth, 2021/01/20
- [PULL 02/14] configure: Add sys/timex.h to probe clock_adjtime, Thomas Huth, 2021/01/20
- [PULL 08/14] tests/docker: Add dockerfile for Alpine Linux, Thomas Huth, 2021/01/20
- [PULL 13/14] MAINTAINERS: Remove Ben Warren, Thomas Huth, 2021/01/20
- [PULL 04/14] hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE, Thomas Huth, 2021/01/20
- [PULL 05/14] elf2dmp: Rename PAGE_SIZE to ELF2DMP_PAGE_SIZE, Thomas Huth, 2021/01/20
- [PULL 10/14] gitlab-ci: Add alpine to pipeline, Thomas Huth, 2021/01/20
- [PULL 14/14] MAINTAINERS: Make status spellings consistent, Thomas Huth, 2021/01/20