aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2018-03-28 14:18:04 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2018-04-09 12:57:06 +0200
commit648abbfbaa4462bc015b15dd335068638bee4246 (patch)
treeedd66fa38ebf98d2e7b0b3c7287511eccefdf5cb /util
parent053e45d2f3d3eb51799f371a39434699984e9019 (diff)
memfd: fix vhost-user-test on non-memfd capable host
On RHEL7, memfd is not supported, and vhost-user-test fails: TEST: tests/vhost-user-test... (pid=10248) /x86_64/vhost-user/migrate: qemu-system-x86_64: -object memory-backend-memfd,id=mem,size=2M,: failed to create memfd FAIL There is a qemu_memfd_check() to prevent running memfd path, but it also checks for fallback implementation. Let's specialize qemu_memfd_check() to check memfd only, while qemu_memfd_alloc_check() checks for the qemu_memfd_alloc() API. Reported-by: Miroslav Rezanina <mrezanin@redhat.com> Tested-by: Miroslav Rezanina <mrezanin@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20180328121804.16203-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to 'util')
-rw-r--r--util/memfd.c34
1 files changed, 33 insertions, 1 deletions
diff --git a/util/memfd.c b/util/memfd.c
index 07d579ea7d..b3ecbac19e 100644
--- a/util/memfd.c
+++ b/util/memfd.c
@@ -173,7 +173,13 @@ enum {
MEMFD_TODO
};
-bool qemu_memfd_check(void)
+/**
+ * qemu_memfd_alloc_check():
+ *
+ * Check if qemu_memfd_alloc() can allocate, including using a
+ * fallback implementation when host doesn't support memfd.
+ */
+bool qemu_memfd_alloc_check(void)
{
static int memfd_check = MEMFD_TODO;
@@ -188,3 +194,29 @@ bool qemu_memfd_check(void)
return memfd_check == MEMFD_OK;
}
+
+/**
+ * qemu_memfd_check():
+ *
+ * Check if host supports memfd.
+ */
+bool qemu_memfd_check(void)
+{
+#ifdef CONFIG_LINUX
+ static int memfd_check = MEMFD_TODO;
+
+ if (memfd_check == MEMFD_TODO) {
+ int mfd = memfd_create("test", 0);
+ if (mfd >= 0) {
+ memfd_check = MEMFD_OK;
+ close(mfd);
+ } else {
+ memfd_check = MEMFD_KO;
+ }
+ }
+
+ return memfd_check == MEMFD_OK;
+#else
+ return false;
+#endif
+}