* [Qemu-devel] [PATCH] migration/postcopy-ram: Guard use of sys/eventfd.h with CONFIG_EVENTFD
@ 2016-02-23 16:09 Matthew Fortune
2016-02-24 11:41 ` Juan Quintela
0 siblings, 1 reply; 2+ messages in thread
From: Matthew Fortune @ 2016-02-23 16:09 UTC (permalink / raw)
To: qemu-devel@nongnu.org; +Cc: Amit Shah, Juan Quintela
sys/eventfd.h was being guarded only by a check for linux but does
not exist on older distributions like CentOS 5. Move the include
into the code that uses it and add an appropriate guard.
Signed-off-by: Matthew Fortune <matthew.fortune@imgtec.com>
---
migration/postcopy-ram.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 254c629..fbd0064 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -52,14 +52,14 @@ struct PostcopyDiscardState {
#if defined(__linux__)
#include <poll.h>
-#include <sys/eventfd.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/syscall.h>
#include <asm/types.h> /* for __u64 */
#endif
-#if defined(__linux__) && defined(__NR_userfaultfd)
+#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
+#include <sys/eventfd.h>
#include <linux/userfaultfd.h>
static bool ufd_version_check(int ufd)
--
2.2.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] migration/postcopy-ram: Guard use of sys/eventfd.h with CONFIG_EVENTFD
2016-02-23 16:09 [Qemu-devel] [PATCH] migration/postcopy-ram: Guard use of sys/eventfd.h with CONFIG_EVENTFD Matthew Fortune
@ 2016-02-24 11:41 ` Juan Quintela
0 siblings, 0 replies; 2+ messages in thread
From: Juan Quintela @ 2016-02-24 11:41 UTC (permalink / raw)
To: Matthew Fortune; +Cc: Amit Shah, qemu-devel@nongnu.org
Matthew Fortune <Matthew.Fortune@imgtec.com> wrote:
> sys/eventfd.h was being guarded only by a check for linux but does
> not exist on older distributions like CentOS 5. Move the include
> into the code that uses it and add an appropriate guard.
>
> Signed-off-by: Matthew Fortune <matthew.fortune@imgtec.com>
> ---
> migration/postcopy-ram.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Thanks.
> diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
> index 254c629..fbd0064 100644
> --- a/migration/postcopy-ram.c
> +++ b/migration/postcopy-ram.c
> @@ -52,14 +52,14 @@ struct PostcopyDiscardState {
> #if defined(__linux__)
>
> #include <poll.h>
> -#include <sys/eventfd.h>
> #include <sys/mman.h>
> #include <sys/ioctl.h>
> #include <sys/syscall.h>
> #include <asm/types.h> /* for __u64 */
> #endif
>
> -#if defined(__linux__) && defined(__NR_userfaultfd)
> +#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
> +#include <sys/eventfd.h>
> #include <linux/userfaultfd.h>
>
> static bool ufd_version_check(int ufd)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-24 11:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-23 16:09 [Qemu-devel] [PATCH] migration/postcopy-ram: Guard use of sys/eventfd.h with CONFIG_EVENTFD Matthew Fortune
2016-02-24 11:41 ` Juan Quintela
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).