[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 14/17] xen: Add xen_mr_is_memory()
From: |
Edgar E. Iglesias |
Subject: |
[PATCH v4 14/17] xen: Add xen_mr_is_memory() |
Date: |
Tue, 30 Apr 2024 18:49:36 +0200 |
From: "Edgar E. Iglesias" <edgar.iglesias@amd.com>
Add xen_mr_is_memory() to abstract away tests for the
xen_memory MR.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
---
hw/xen/xen-hvm-common.c | 8 +++++++-
include/sysemu/xen.h | 8 ++++++++
system/physmem.c | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
index 1627da7398..0267b88d26 100644
--- a/hw/xen/xen-hvm-common.c
+++ b/hw/xen/xen-hvm-common.c
@@ -12,6 +12,12 @@
MemoryRegion xen_memory;
+/* Check for xen memory. */
+bool xen_mr_is_memory(MemoryRegion *mr)
+{
+ return mr == &xen_memory;
+}
+
void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
Error **errp)
{
@@ -28,7 +34,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
MemoryRegion *mr,
return;
}
- if (mr == &xen_memory) {
+ if (xen_mr_is_memory(mr)) {
return;
}
diff --git a/include/sysemu/xen.h b/include/sysemu/xen.h
index 754ec2e6cb..dc72f83bcb 100644
--- a/include/sysemu/xen.h
+++ b/include/sysemu/xen.h
@@ -34,6 +34,8 @@ void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t
length);
void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
struct MemoryRegion *mr, Error **errp);
+bool xen_mr_is_memory(MemoryRegion *mr);
+
#else /* !CONFIG_XEN_IS_POSSIBLE */
#define xen_enabled() 0
@@ -47,6 +49,12 @@ static inline void xen_ram_alloc(ram_addr_t ram_addr,
ram_addr_t size,
g_assert_not_reached();
}
+static inline bool xen_mr_is_memory(MemoryRegion *mr)
+{
+ g_assert_not_reached();
+ return false;
+}
+
#endif /* CONFIG_XEN_IS_POSSIBLE */
#endif
diff --git a/system/physmem.c b/system/physmem.c
index ad7a8c7d95..1a5ffcba2a 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -2227,7 +2227,7 @@ static void *qemu_ram_ptr_length(RAMBlock *block,
ram_addr_t addr,
* because we don't want to map the entire memory in QEMU.
* In that case just map the requested area.
*/
- if (block->offset == 0) {
+ if (xen_mr_is_memory(block->mr)) {
return xen_map_cache(block->mr, addr, len, lock, lock,
is_write);
}
--
2.40.1
- [PATCH v4 12/17] xen: mapcache: Unmap first entries in buckets, (continued)
- [PATCH v4 12/17] xen: mapcache: Unmap first entries in buckets, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 09/17] xen: mapcache: Break out xen_invalidate_map_cache_single(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 13/17] softmmu: Pass RAM MemoryRegion and is_write xen_map_cache(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 08/17] xen: mapcache: Refactor xen_invalidate_map_cache_entry_unlocked, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 10/17] xen: mapcache: Break out xen_map_cache_init_single(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 05/17] xen: mapcache: Refactor xen_remap_bucket for multi-instance, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 07/17] xen: mapcache: Refactor xen_replace_cache_entry_unlocked, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 06/17] xen: mapcache: Break out xen_ram_addr_from_mapcache_single, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 11/17] xen: mapcache: Make MCACHE_BUCKET_SHIFT runtime configurable, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 15/17] xen: mapcache: Remove assumption of RAMBlock with 0 offset, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 14/17] xen: Add xen_mr_is_memory(),
Edgar E. Iglesias <=
- [PATCH v4 17/17] hw/arm: xen: Enable use of grant mappings, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 16/17] xen: mapcache: Add support for grant mappings, Edgar E. Iglesias, 2024/04/30