[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 74/79] exec: drop bogus mem_path from qemu_ram_alloc_from_fd()
From: |
Igor Mammedov |
Subject: |
[PATCH v5 74/79] exec: drop bogus mem_path from qemu_ram_alloc_from_fd() |
Date: |
Mon, 17 Feb 2020 12:34:47 -0500 |
Function will report error that will mention global mem_path,
which was valid the only if legacy -mem-path was used and
only in case of main RAM.
However it doesn't work with hostmem backends
(for example:
"
qemu: -object memory-backend-file,id=ram0,size=128M,mem-path=foo:
backing store (null) size 0x200000 does not match 'size' option 0x8000000
")
and couldn't possibly work in general FD case the function
is supposed to handle.
Taking in account that main RAM was converted into
memory-backend-foo object, there is no point in printing
file name (from inappropriate place) as failing path is
a part of backend's error message.
Hence drop bogus mem_path usage from qemu_ram_alloc_from_fd(),
it's a job of its user to add file name to error message if applicable.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
exec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index d85a8689d4..6ebff8bd3a 100644
--- a/exec.c
+++ b/exec.c
@@ -2307,9 +2307,9 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size,
MemoryRegion *mr,
size = HOST_PAGE_ALIGN(size);
file_size = get_file_size(fd);
if (file_size > 0 && file_size < size) {
- error_setg(errp, "backing store %s size 0x%" PRIx64
+ error_setg(errp, "backing store size 0x%" PRIx64
" does not match 'size' option 0x" RAM_ADDR_FMT,
- mem_path, file_size, size);
+ file_size, size);
return NULL;
}
--
2.18.1
- [PATCH v5 69/79] sparc/leon3: use memdev for RAM, (continued)
- [PATCH v5 69/79] sparc/leon3: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 67/79] ppc/spapr: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 65/79] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 70/79] sparc/sun4m: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 72/79] remove no longer used memory_region_allocate_system_memory(), Igor Mammedov, 2020/02/17
- [PATCH v5 74/79] exec: drop bogus mem_path from qemu_ram_alloc_from_fd(),
Igor Mammedov <=
- [PATCH v5 73/79] exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize(), Igor Mammedov, 2020/02/17
- [PATCH v5 71/79] sparc/niagara: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 75/79] make mem_path local variable, Igor Mammedov, 2020/02/17
- [PATCH v5 76/79] hostmem: introduce "prealloc-threads" property, Igor Mammedov, 2020/02/17
- [PATCH v5 78/79] tests/numa-test: make top level args dynamic and g_autofree(cli) cleanups, Igor Mammedov, 2020/02/17
- [PATCH v5 79/79] tests:numa-test: use explicit memdev to specify node RAM, Igor Mammedov, 2020/02/17