|
 |
4ec855 |
From bf545f4a8f40a4ac8f6d63d887a63d9f08329eb6 Mon Sep 17 00:00:00 2001
|
|
|
4ec855 |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
4ec855 |
Date: Wed, 14 Aug 2019 08:52:10 +0100
|
|
|
4ec855 |
Subject: [PATCH 10/10] RHEL: disable hostmem-memfd
|
|
|
4ec855 |
MIME-Version: 1.0
|
|
|
4ec855 |
Content-Type: text/plain; charset=UTF-8
|
|
|
4ec855 |
Content-Transfer-Encoding: 8bit
|
|
|
4ec855 |
|
|
|
4ec855 |
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
4ec855 |
Message-id: <20190814085210.18462-1-marcandre.lureau@redhat.com>
|
|
|
4ec855 |
Patchwork-id: 89974
|
|
|
4ec855 |
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH] RHEL: disable hostmem-memfd
|
|
|
4ec855 |
Bugzilla: 1740797
|
|
|
4ec855 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4ec855 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
4ec855 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
4ec855 |
|
|
|
4ec855 |
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1740797
|
|
|
4ec855 |
BRANCH: rhel8/rhel-8.1.0
|
|
|
4ec855 |
UPSTREAM: n/a (downstream only)
|
|
|
4ec855 |
BREW: 23060214
|
|
|
4ec855 |
|
|
|
4ec855 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
4ec855 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
4ec855 |
---
|
|
|
4ec855 |
backends/Makefile.objs | 3 ++-
|
|
|
4ec855 |
util/memfd.c | 2 +-
|
|
|
4ec855 |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
4ec855 |
|
|
|
4ec855 |
diff --git a/backends/Makefile.objs b/backends/Makefile.objs
|
|
|
4ec855 |
index ad7c032..673fc55 100644
|
|
|
4ec855 |
--- a/backends/Makefile.objs
|
|
|
4ec855 |
+++ b/backends/Makefile.objs
|
|
|
4ec855 |
@@ -15,4 +15,5 @@ common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) += \
|
|
|
4ec855 |
cryptodev-vhost-user.o
|
|
|
4ec855 |
endif
|
|
|
4ec855 |
|
|
|
4ec855 |
-common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
|
|
|
4ec855 |
+# RHEL: disable memfd
|
|
|
4ec855 |
+# common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
|
|
|
4ec855 |
diff --git a/util/memfd.c b/util/memfd.c
|
|
|
4ec855 |
index b3ecbac..9312653 100644
|
|
|
4ec855 |
--- a/util/memfd.c
|
|
|
4ec855 |
+++ b/util/memfd.c
|
|
|
4ec855 |
@@ -202,7 +202,7 @@ bool qemu_memfd_alloc_check(void)
|
|
|
4ec855 |
*/
|
|
|
4ec855 |
bool qemu_memfd_check(void)
|
|
|
4ec855 |
{
|
|
|
4ec855 |
-#ifdef CONFIG_LINUX
|
|
|
4ec855 |
+#if 0 /* RHEL: memfd support disabled */
|
|
|
4ec855 |
static int memfd_check = MEMFD_TODO;
|
|
|
4ec855 |
|
|
|
4ec855 |
if (memfd_check == MEMFD_TODO) {
|
|
|
4ec855 |
--
|
|
|
4ec855 |
1.8.3.1
|
|
|
4ec855 |
|