[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 75/80] exec: drop bogus mem_path from qemu_ram_alloc_from_fd()
From: |
Igor Mammedov |
Subject: |
[PATCH v4 75/80] exec: drop bogus mem_path from qemu_ram_alloc_from_fd() |
Date: |
Fri, 31 Jan 2020 16:09:45 +0100 |
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>
---
CC: address@hidden
CC: address@hidden
---
exec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index 9f5421c..d827fac 100644
--- a/exec.c
+++ b/exec.c
@@ -2308,9 +2308,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.7.4
- [PATCH v4 66/80] ppc/prep: use memdev for RAM, (continued)
- [PATCH v4 66/80] ppc/prep: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 62/80] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/01/31
- [PATCH v4 69/80] ppc/virtex_ml507: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 65/80] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 64/80] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 72/80] sparc/niagara: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 68/80] ppc/virtex_ml507: remove unused arguments, Igor Mammedov, 2020/01/31
- [PATCH v4 70/80] sparc/leon3: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 71/80] sparc/sun4m: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 73/80] remove no longer used memory_region_allocate_system_memory(), Igor Mammedov, 2020/01/31
- [PATCH v4 75/80] exec: drop bogus mem_path from qemu_ram_alloc_from_fd(),
Igor Mammedov <=
- [PATCH v4 74/80] exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize(), Igor Mammedov, 2020/01/31
- [PATCH v4 76/80] make mem_path local variable, Igor Mammedov, 2020/01/31
- [PATCH v4 77/80] hostmem: introduce "prealloc-threads" property, Igor Mammedov, 2020/01/31
- [PATCH v4 79/80] tests/numa-test: make top level args dynamic and g_autofree(cli) cleanups, Igor Mammedov, 2020/01/31
- [PATCH v4 78/80] hostmem: fix strict bind policy, Igor Mammedov, 2020/01/31
- [PATCH v4 80/80] tests:numa-test: use explicit memdev to specify node RAM, Igor Mammedov, 2020/01/31
- Re: [PATCH v4 00/80] refactor main RAM allocation to use hostmem backend, no-reply, 2020/01/31
- Re: [PATCH v4 00/80] refactor main RAM allocation to use hostmem backend, no-reply, 2020/01/31