From: Philippe Mathieu-Daudé <[email protected]> Mark the MemoryRegion structure const when is only accessed read-only.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Peter Xu <[email protected]> --- include/system/xen-mapcache.h | 2 +- include/system/xen.h | 6 +++--- hw/xen/xen-hvm-common.c | 8 ++++---- hw/xen/xen-mapcache.c | 2 +- hw/xen/xen_stubs.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/system/xen-mapcache.h b/include/system/xen-mapcache.h index c46190dd0c..114d1929c8 100644 --- a/include/system/xen-mapcache.h +++ b/include/system/xen-mapcache.h @@ -16,7 +16,7 @@ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset, bool xen_map_cache_enabled(void); void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque); -uint8_t *xen_map_cache(MemoryRegion *mr, hwaddr phys_addr, hwaddr size, +uint8_t *xen_map_cache(const MemoryRegion *mr, hwaddr phys_addr, hwaddr size, ram_addr_t ram_addr_offset, uint8_t lock, bool dma, bool is_write); diff --git a/include/system/xen.h b/include/system/xen.h index 9a7c53f283..43b857e4d1 100644 --- a/include/system/xen.h +++ b/include/system/xen.h @@ -30,7 +30,7 @@ extern bool xen_allowed; 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); -bool xen_mr_is_grants(MemoryRegion *mr); + const MemoryRegion *mr, Error **errp); +bool xen_mr_is_memory(const MemoryRegion *mr); +bool xen_mr_is_grants(const MemoryRegion *mr); #endif diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index eb7f6270a0..62d88804c4 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -23,19 +23,19 @@ MemoryRegion xen_memory, xen_grants; /* Check for any kind of xen memory, foreign mappings or grants. */ -bool xen_mr_is_memory(MemoryRegion *mr) +bool xen_mr_is_memory(const MemoryRegion *mr) { return mr == &xen_memory || mr == &xen_grants; } /* Check specifically for grants. */ -bool xen_mr_is_grants(MemoryRegion *mr) +bool xen_mr_is_grants(const MemoryRegion *mr) { return mr == &xen_grants; } -void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, - Error **errp) +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + const MemoryRegion *mr, Error **errp) { unsigned target_page_bits = qemu_target_page_bits(); unsigned long nr_pfn; diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c index a3c162cd4c..85cf0cf359 100644 --- a/hw/xen/xen-mapcache.c +++ b/hw/xen/xen-mapcache.c @@ -460,7 +460,7 @@ tryagain: return mc->last_entry->vaddr_base + address_offset; } -uint8_t *xen_map_cache(MemoryRegion *mr, +uint8_t *xen_map_cache(const MemoryRegion *mr, hwaddr phys_addr, hwaddr size, ram_addr_t ram_addr_offset, uint8_t lock, bool dma, diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c index a39efb5062..f830768d99 100644 --- a/hw/xen/xen_stubs.c +++ b/hw/xen/xen_stubs.c @@ -19,12 +19,12 @@ 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) + const MemoryRegion *mr, Error **errp) { g_assert_not_reached(); } -bool xen_mr_is_memory(MemoryRegion *mr) +bool xen_mr_is_memory(const MemoryRegion *mr) { g_assert_not_reached(); } @@ -44,7 +44,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr) g_assert_not_reached(); } -uint8_t *xen_map_cache(MemoryRegion *mr, +uint8_t *xen_map_cache(const MemoryRegion *mr, hwaddr phys_addr, hwaddr size, ram_addr_t ram_addr_offset, -- 2.50.1
