[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/9] exec: check kvm mmu notifiers earlier
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 1/9] exec: check kvm mmu notifiers earlier |
Date: |
Fri, 2 Jun 2017 18:12:21 +0400 |
Move kvm mmu notifiers check before calling file_ram_alloc(), with the
other xen precondition. (file_ram_alloc() will be reused in other cases
than -mem-path).
Signed-off-by: Marc-André Lureau <address@hidden>
---
exec.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/exec.c b/exec.c
index b1db12fe36..9c6c3cfe87 100644
--- a/exec.c
+++ b/exec.c
@@ -1496,12 +1496,6 @@ static void *file_ram_alloc(RAMBlock *block,
int fd = -1;
int64_t file_size;
- if (kvm_enabled() && !kvm_has_sync_mmu()) {
- error_setg(errp,
- "host lacks kvm mmu notifiers, -mem-path unsupported");
- return NULL;
- }
-
for (;;) {
fd = open(path, O_RDWR);
if (fd >= 0) {
@@ -1944,6 +1938,12 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size,
MemoryRegion *mr,
return NULL;
}
+ if (kvm_enabled() && !kvm_has_sync_mmu()) {
+ error_setg(errp,
+ "host lacks kvm mmu notifiers, -mem-path unsupported");
+ return NULL;
+ }
+
if (phys_mem_alloc != qemu_anon_ram_alloc) {
/*
* file_ram_alloc() needs to allocate just like
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PATCH v3 0/9] Add memfd memory backend, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 1/9] exec: check kvm mmu notifiers earlier,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 2/9] exec: split file_ram_alloc(), Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 3/9] exec: split qemu_ram_alloc_from_file(), Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 4/9] Add memory_region_init_ram_from_fd(), Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 5/9] ivshmem: use ram_from_fd(), Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 6/9] memory: remove memory_region_set_fd, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 7/9] memfd: split qemu_memfd_alloc(), Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 8/9] Add memfd based hostmem, Marc-André Lureau, 2017/06/02
- [Qemu-devel] [PATCH v3 9/9] tests: use memfd in vhost-user-test, Marc-André Lureau, 2017/06/02