From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyKtJ-0003PL-Iq for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:17:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyKtG-0002RR-EQ for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:17:41 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36246 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyKtG-0002Qu-AG for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:17:38 -0400 Date: Tue, 20 Mar 2018 19:17:35 +0200 From: "Michael S. Tsirkin" Message-ID: <1521566230-111929-4-git-send-email-mst@redhat.com> References: <1521566230-111929-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1521566230-111929-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/3] postcopy: drop unnecessary conditions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Peter Maydell , Juan Quintela We have our own copy of unistd so there is no need to check for symbols present there. Signed-off-by: Michael S. Tsirkin --- 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 /* for __u64 */ #endif -#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD) +#if defined(__linux__) && defined(CONFIG_EVENTFD) #include #include @@ -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 #endif -#if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD) +#if defined(__linux__) && defined(CONFIG_EVENTFD) #include #include #include -- MST