We have our own copy of unistd so there is no
need to check for symbols present there.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 migration/postcopy-ram.c | 4 +---
 tests/migration-test.c   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index efd7793..027c02c 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -86,7 +86,7 @@ int postcopy_notify(enum PostcopyNotifyReason reason, Error **errp)
 #include <asm/types.h> /* for __u64 */
 #endif
 
-#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
+#if defined(__linux__) && defined(CONFIG_EVENTFD)
 #include <sys/eventfd.h>
 #include <linux/userfaultfd.h>
 
@@ -97,7 +97,6 @@ int postcopy_notify(enum PostcopyNotifyReason reason, Error **errp)
  *
  * Returns: true on success
  *
- * __NR_userfaultfd - should be checked before
  *  @features: out parameter will contain uffdio_api.features provided by kernel
  *              in case of success
  */
@@ -107,7 +106,6 @@ static bool receive_ufd_features(uint64_t *features)
     int ufd;
     bool ret = true;
 
-    /* if we are here __NR_userfaultfd should exists */
     ufd = syscall(__NR_userfaultfd, O_CLOEXEC);
     if (ufd == -1) {
         error_report("%s: syscall __NR_userfaultfd failed: %s", __func__,
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 422bf1a..e5dcedb 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -32,7 +32,7 @@ bool got_stop;
 #include <sys/vfs.h>
 #endif
 
-#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
+#if defined(__linux__) && defined(CONFIG_EVENTFD)
 #include <sys/eventfd.h>
 #include <sys/ioctl.h>
 #include <linux/userfaultfd.h>
-- 
MST

On 20 March 2018 at 17:17, Michael S. Tsirkin <mst@redhat.com> wrote:
> We have our own copy of unistd so there is no
> need to check for symbols present there.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

I just sent a mail in the other thread about this, but we
only have our own copy of unistd if the host architecture
supports KVM. If it doesn't then we're going to be using
the system's copy of the includes...

thanks
-- PMM

On Tue, Mar 20, 2018 at 05:20:04PM +0000, Peter Maydell wrote:
> On 20 March 2018 at 17:17, Michael S. Tsirkin <mst@redhat.com> wrote:
> > We have our own copy of unistd so there is no
> > need to check for symbols present there.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> I just sent a mail in the other thread about this, but we
> only have our own copy of unistd if the host architecture
> supports KVM. If it doesn't then we're going to be using
> the system's copy of the includes...
> 
> thanks
> -- PMM

Hmm good point.

I guess I should leave postcopy alone then, and just update
the headers?

That can go through my tree ...

-- 
MST

On Tue, Mar 20, 2018 at 07:17:35PM +0200, Michael S. Tsirkin wrote:
> We have our own copy of unistd so there is no
> need to check for symbols present there.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Self-Nack

pls ignore - we do not have unistd.h on all systems unfortunately.

Will send v3 without this patch and with more tweaks.

> ---
>  migration/postcopy-ram.c | 4 +---
>  tests/migration-test.c   | 2 +-
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
> index efd7793..027c02c 100644
> --- a/migration/postcopy-ram.c
> +++ b/migration/postcopy-ram.c
> @@ -86,7 +86,7 @@ int postcopy_notify(enum PostcopyNotifyReason reason, Error **errp)
>  #include <asm/types.h> /* for __u64 */
>  #endif
>  
> -#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
> +#if defined(__linux__) && defined(CONFIG_EVENTFD)
>  #include <sys/eventfd.h>
>  #include <linux/userfaultfd.h>
>  
> @@ -97,7 +97,6 @@ int postcopy_notify(enum PostcopyNotifyReason reason, Error **errp)
>   *
>   * Returns: true on success
>   *
> - * __NR_userfaultfd - should be checked before
>   *  @features: out parameter will contain uffdio_api.features provided by kernel
>   *              in case of success
>   */
> @@ -107,7 +106,6 @@ static bool receive_ufd_features(uint64_t *features)
>      int ufd;
>      bool ret = true;
>  
> -    /* if we are here __NR_userfaultfd should exists */
>      ufd = syscall(__NR_userfaultfd, O_CLOEXEC);
>      if (ufd == -1) {
>          error_report("%s: syscall __NR_userfaultfd failed: %s", __func__,
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 422bf1a..e5dcedb 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -32,7 +32,7 @@ bool got_stop;
>  #include <sys/vfs.h>
>  #endif
>  
> -#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
> +#if defined(__linux__) && defined(CONFIG_EVENTFD)
>  #include <sys/eventfd.h>
>  #include <sys/ioctl.h>
>  #include <linux/userfaultfd.h>
> -- 
> MST
>