[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/33] sysemu/memory_mapping: Become target-agnostic
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 05/33] sysemu/memory_mapping: Become target-agnostic |
Date: |
Sun, 6 Mar 2022 13:59:32 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
target_ulong is target-specific, while vaddr isn't.
Remove the unnecessary "exec/cpu-defs.h" target-speficic header
from "memory_mapping.h" and use the target-agnostic "hw/core/cpu.h"
locally in memory_mapping.c.
Remove "exec/memory.h" since MemoryRegion is forward-declared in
"qemu/typedefs.h".
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220207075426.81934-6-f4bug@amsat.org>
---
include/sysemu/memory_mapping.h | 5 ++---
softmmu/memory_mapping.c | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h
index 4b20f1a639e..3bbeb1bcb41 100644
--- a/include/sysemu/memory_mapping.h
+++ b/include/sysemu/memory_mapping.h
@@ -15,8 +15,7 @@
#define MEMORY_MAPPING_H
#include "qemu/queue.h"
-#include "exec/cpu-defs.h"
-#include "exec/memory.h"
+#include "exec/cpu-common.h"
typedef struct GuestPhysBlock {
/* visible to guest, reflects PCI hole, etc */
@@ -43,7 +42,7 @@ typedef struct GuestPhysBlockList {
/* The physical and virtual address in the memory mapping are contiguous. */
typedef struct MemoryMapping {
hwaddr phys_addr;
- target_ulong virt_addr;
+ vaddr virt_addr;
ram_addr_t length;
QTAILQ_ENTRY(MemoryMapping) next;
} MemoryMapping;
diff --git a/softmmu/memory_mapping.c b/softmmu/memory_mapping.c
index a62eaa49ccb..8320165ea24 100644
--- a/softmmu/memory_mapping.c
+++ b/softmmu/memory_mapping.c
@@ -17,6 +17,7 @@
#include "sysemu/memory_mapping.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
+#include "hw/core/cpu.h"
//#define DEBUG_GUEST_PHYS_REGION_ADD
--
2.35.1
- [PULL 00/33] Abstract ArchCPU, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 01/33] accel: Restrict sysemu stubs to system emulation, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 02/33] accel/meson: Only build hw virtualization with system emulation, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 03/33] exec: Declare vaddr as a generic target-agnostic type, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 04/33] exec: Make cpu_memory_rw_debug() target agnostic, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 05/33] sysemu/memory_mapping: Become target-agnostic,
Philippe Mathieu-Daudé <=
- [PULL 06/33] sysemu/kvm: Make kvm_on_sigbus() / kvm_on_sigbus_vcpu() target agnostic, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 07/33] accel/kvm: Simplify user-mode #ifdef'ry, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 08/33] accel/hax: Introduce CONFIG_HAX_IS_POSSIBLE, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 09/33] softmmu/cpus: Code movement, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 10/33] accel: Introduce AccelOpsClass::cpu_thread_is_idle(), Philippe Mathieu-Daudé, 2022/03/06
- [PULL 11/33] accel: Introduce AccelOpsClass::cpus_are_resettable(), Philippe Mathieu-Daudé, 2022/03/06
- [PULL 12/33] softmmu/globals: Remove unused 'hw/i386/*' headers, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 13/33] softmmu/physmem: Remove unnecessary include, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 14/33] softmmu/cpu-timers: Remove unused 'exec/exec-all.h' header, Philippe Mathieu-Daudé, 2022/03/06
- [PULL 15/33] misc: Remove unnecessary "sysemu/cpu-timers.h" include, Philippe Mathieu-Daudé, 2022/03/06