ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hostmem: simplify the code for merge and dump properties 

No semantic change, just simpler control flow.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-06-06 13:06:56 +02:00
parent a2b6a96505
commit 5becdc0ab0
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backends/hostmem.c
View File

@ -178,19 +178,16 @@ static void host_memory_backend_set_merge(Object *obj, bool value, Error **errp)
return; return;
} }
if (!host_memory_backend_mr_inited(backend)) { if (!host_memory_backend_mr_inited(backend) &&
backend->merge = value; value != backend->merge) {
return;
}
if (value != backend->merge) {
void *ptr = memory_region_get_ram_ptr(&backend->mr); void *ptr = memory_region_get_ram_ptr(&backend->mr);
uint64_t sz = memory_region_size(&backend->mr); uint64_t sz = memory_region_size(&backend->mr);
qemu_madvise(ptr, sz, qemu_madvise(ptr, sz,
value ? QEMU_MADV_MERGEABLE : QEMU_MADV_UNMERGEABLE); value ? QEMU_MADV_MERGEABLE : QEMU_MADV_UNMERGEABLE);
backend->merge = value;
} }
backend->merge = value;
} }
static bool host_memory_backend_get_dump(Object *obj, Error **errp) static bool host_memory_backend_get_dump(Object *obj, Error **errp)
@ -212,19 +209,16 @@ static void host_memory_backend_set_dump(Object *obj, bool value, Error **errp)
return; return;
} }
if (!host_memory_backend_mr_inited(backend)) { if (host_memory_backend_mr_inited(backend) &&
backend->dump = value; value != backend->dump) {
return;
}
if (value != backend->dump) {
void *ptr = memory_region_get_ram_ptr(&backend->mr); void *ptr = memory_region_get_ram_ptr(&backend->mr);
uint64_t sz = memory_region_size(&backend->mr); uint64_t sz = memory_region_size(&backend->mr);
qemu_madvise(ptr, sz, qemu_madvise(ptr, sz,
value ? QEMU_MADV_DODUMP : QEMU_MADV_DONTDUMP); value ? QEMU_MADV_DODUMP : QEMU_MADV_DONTDUMP);
backend->dump = value;
} }
backend->dump = value;
} }
static bool host_memory_backend_get_prealloc(Object *obj, Error **errp) static bool host_memory_backend_get_prealloc(Object *obj, Error **errp)