postcopy: drop unnecessary conditions

PATCH New Michael S. Tsirkin 1 participant 1 message Mar 20, 2018

lore

Share & tools

lore

Michael S. Tsirkin

author

2018-03-20 15:09 UTC #0 lore raw

PATCH 1/1 postcopy: drop unnecessary conditions

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

Signed-off-by Michael S. Tsirkin <[email protected]>

---
 migration/postcopy-ram.c | 4 +---
 tests/migration-test.c   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

migration/postcopy-ram.c +1 -3

index efd7793..027c02c 100644
@@ -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__,

tests/migration-test.c +1 -1

index 422bf1a..e5dcedb 100644
@@ -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>

Signature · 1 line

MST