File qemu.75e5b70e6b5dcc4f2219992d7cffa462aa406af0.p... of Package qemu-2.10

Overview Repositories Revisions Requests Users Attributes Meta

File qemu.75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch of Package qemu-2.10 (Revision 11d2d57d4fbd5d8f3382327e4d39e366)

Currently displaying revision 11d2d57d4fbd5d8f3382327e4d39e366 , Show latest

From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 28 Nov 2017 11:51:27 +0100
Subject: 75e5b70e6b5dcc4f2219992d7cffa462aa406af0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

memfd: fix configure test

Recent glibc added memfd_create in sys/mman.h.  This conflicts with
the definition in util/memfd.c:

/builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration

Fix the configure test, and remove the sys/memfd.h inclusion since the
file actually does not exist---it is a typo in the memfd_create(2) man
page.

Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure    | 2 +-
 util/memfd.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

--- a/configure
+++ b/configure
@@ -3846,25 +3846,25 @@ cat > $TMPC << EOF
 int main(void)
 {
     return eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
 }
 EOF
 if compile_prog "" "" ; then
   eventfd=yes
 fi
 
 # check if memfd is supported
 memfd=no
 cat > $TMPC << EOF
-#include <sys/memfd.h>
+#include <sys/mman.h>
 
 int main(void)
 {
     return memfd_create("foo", MFD_ALLOW_SEALING);
 }
 EOF
 if compile_prog "" "" ; then
   memfd=yes
 fi
 
 
 
--- a/util/memfd.c
+++ b/util/memfd.c
@@ -22,27 +22,25 @@
  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
 
 #include "qemu/osdep.h"
 
 #include <glib/gprintf.h>
 
 #include "qemu/memfd.h"
 
-#ifdef CONFIG_MEMFD
-#include <sys/memfd.h>
-#elif defined CONFIG_LINUX
+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
 #include <sys/syscall.h>
 #include <asm/unistd.h>
 
 static int memfd_create(const char *name, unsigned int flags)
 {
 #ifdef __NR_memfd_create
     return syscall(__NR_memfd_create, name, flags);
 #else
     return -1;
 #endif
 }
 #endif

Places

File qemu.75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch of Package qemu-2.10 (Revision 11d2d57d4fbd5d8f3382327e4d39e366)

Places