mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
system/ramblock: Move ram_block_is_pmem() declaration
Move ramblock_is_pmem() along with the RAM Block API exposed by the "system/ramblock.h" header. Rename as ram_block_is_pmem() to keep API prefix consistency. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Acked-by: Peter Xu <peterx@redhat.com> Message-Id: <20251002032812.26069-3-philmd@linaro.org>
This commit is contained in:
@@ -99,8 +99,6 @@ static inline unsigned long int ramblock_recv_bitmap_offset(void *host_addr,
|
||||
return host_addr_offset >> TARGET_PAGE_BITS;
|
||||
}
|
||||
|
||||
bool ramblock_is_pmem(RAMBlock *rb);
|
||||
|
||||
/**
|
||||
* qemu_ram_alloc_from_file,
|
||||
* qemu_ram_alloc_from_fd: Allocate a ram block from the specified backing
|
||||
|
||||
@@ -108,4 +108,9 @@ void ram_block_attributes_destroy(RamBlockAttributes *attr);
|
||||
int ram_block_attributes_state_change(RamBlockAttributes *attr, uint64_t offset,
|
||||
uint64_t size, bool to_discard);
|
||||
|
||||
/**
|
||||
* ram_block_is_pmem: Whether the RAM block is of persistent memory
|
||||
*/
|
||||
bool ram_block_is_pmem(RAMBlock *rb);
|
||||
|
||||
#endif
|
||||
|
||||
+2
-1
@@ -53,6 +53,7 @@
|
||||
#include "qemu/rcu_queue.h"
|
||||
#include "migration/colo.h"
|
||||
#include "system/cpu-throttle.h"
|
||||
#include "system/ramblock.h"
|
||||
#include "savevm.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "multifd.h"
|
||||
@@ -4370,7 +4371,7 @@ static bool ram_has_postcopy(void *opaque)
|
||||
{
|
||||
RAMBlock *rb;
|
||||
RAMBLOCK_FOREACH_NOT_IGNORED(rb) {
|
||||
if (ramblock_is_pmem(rb)) {
|
||||
if (ram_block_is_pmem(rb)) {
|
||||
info_report("Block: %s, host: %p is a nvdimm memory, postcopy"
|
||||
"is not supported now!", rb->idstr, rb->host);
|
||||
return false;
|
||||
|
||||
+3
-2
@@ -43,6 +43,7 @@
|
||||
#include "system/kvm.h"
|
||||
#include "system/tcg.h"
|
||||
#include "system/qtest.h"
|
||||
#include "system/ramblock.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu/config-file.h"
|
||||
#include "qemu/error-report.h"
|
||||
@@ -1802,7 +1803,7 @@ void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length)
|
||||
|
||||
#ifdef CONFIG_LIBPMEM
|
||||
/* The lack of support for pmem should not block the sync */
|
||||
if (ramblock_is_pmem(block)) {
|
||||
if (ram_block_is_pmem(block)) {
|
||||
void *addr = ramblock_ptr(block, start);
|
||||
pmem_persist(addr, length);
|
||||
return;
|
||||
@@ -3941,7 +3942,7 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool ramblock_is_pmem(RAMBlock *rb)
|
||||
bool ram_block_is_pmem(RAMBlock *rb)
|
||||
{
|
||||
return rb->flags & RAM_PMEM;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user