Since qemu_prealloc_mem() returns whether or not an error
occured, we don't need to check the @errp pointer. Remove
local_err uses when we can return directly.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <
20231120213301.24349-20-philmd@linaro.org>
static void host_memory_backend_set_prealloc(Object *obj, bool value,
Error **errp)
{
static void host_memory_backend_set_prealloc(Object *obj, bool value,
Error **errp)
{
- Error *local_err = NULL;
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
if (!backend->reserve && value) {
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
if (!backend->reserve && value) {
void *ptr = memory_region_get_ram_ptr(&backend->mr);
uint64_t sz = memory_region_size(&backend->mr);
void *ptr = memory_region_get_ram_ptr(&backend->mr);
uint64_t sz = memory_region_size(&backend->mr);
- qemu_prealloc_mem(fd, ptr, sz, backend->prealloc_threads,
- backend->prealloc_context, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (!qemu_prealloc_mem(fd, ptr, sz, backend->prealloc_threads,
+ backend->prealloc_context, errp)) {
return;
}
backend->prealloc = true;
return;
}
backend->prealloc = true;
* This is necessary to guarantee memory is allocated with
* specified NUMA policy in place.
*/
* This is necessary to guarantee memory is allocated with
* specified NUMA policy in place.
*/
- if (backend->prealloc) {
- Error *local_err = NULL;
-
- qemu_prealloc_mem(memory_region_get_fd(&backend->mr), ptr, sz,
- backend->prealloc_threads,
- backend->prealloc_context, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
+ if (backend->prealloc && !qemu_prealloc_mem(memory_region_get_fd(&backend->mr),
+ ptr, sz,
+ backend->prealloc_threads,
+ backend->prealloc_context, errp)) {
+ return;
int fd = memory_region_get_fd(&vmem->memdev->mr);
Error *local_err = NULL;
int fd = memory_region_get_fd(&vmem->memdev->mr);
Error *local_err = NULL;
- qemu_prealloc_mem(fd, area, size, 1, NULL, &local_err);
- if (local_err) {
+ if (!qemu_prealloc_mem(fd, area, size, 1, NULL, &local_err)) {
int fd = memory_region_get_fd(&vmem->memdev->mr);
Error *local_err = NULL;
int fd = memory_region_get_fd(&vmem->memdev->mr);
Error *local_err = NULL;
- qemu_prealloc_mem(fd, area, size, 1, NULL, &local_err);
- if (local_err) {
+ if (!qemu_prealloc_mem(fd, area, size, 1, NULL, &local_err)) {
error_report_err(local_err);
return -ENOMEM;
}
error_report_err(local_err);
return -ENOMEM;
}