haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vhost: add migration block if memfd failed

Browse source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Thibaut Collet <thibaut.collet@6wind.com>
This commit is contained in:
Marc-André Lureau 2015-10-09 17:17:34 +02:00 committed by Michael S. Tsirkin
parent de1372d466
commit 31190ed781
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hw/virtio/vhost.c
View file

@ -1019,6 +1019,9 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
if (!(hdev->features & (0x1ULL << VHOST_F_LOG_ALL))) {
error_setg(&hdev->migration_blocker,
"Migration disabled: vhost lacks VHOST_F_LOG_ALL feature.");
} else if (!qemu_memfd_check()) {
error_setg(&hdev->migration_blocker,
"Migration disabled: failed to allocate shared memory");
}
}

2
include/qemu/memfd.h
View file

@ -2,6 +2,7 @@
#define QEMU_MEMFD_H
#include "config-host.h"
#include <stdbool.h>
#ifndef F_LINUX_SPECIFIC_BASE
#define F_LINUX_SPECIFIC_BASE 1024
@ -20,5 +21,6 @@
void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals,
int *fd);
void qemu_memfd_free(void *ptr, size_t size, int fd);
bool qemu_memfd_check(void);
#endif /* QEMU_MEMFD_H */

22
util/memfd.c
View file

@ -138,3 +138,25 @@ void qemu_memfd_free(void *ptr, size_t size, int fd)
close(fd);
}
}
enum {
MEMFD_KO,
MEMFD_OK,
MEMFD_TODO
};
bool qemu_memfd_check(void)
{
static int memfd_check = MEMFD_TODO;
if (memfd_check == MEMFD_TODO) {
int fd;
void *ptr;
ptr = qemu_memfd_alloc("test", 4096, 0, &fd);
memfd_check = ptr ? MEMFD_OK : MEMFD_KO;
qemu_memfd_free(ptr, 4096, fd);
}
return memfd_check == MEMFD_OK;
}