[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/21] exec: Declare vaddr as a generic target-agnostic type
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 03/21] exec: Declare vaddr as a generic target-agnostic type |
Date: |
Thu, 3 Feb 2022 20:17:56 +0100 |
Move vaddr type declaration to the generic "exec/cpu-common.h" header.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/exec/cpu-common.h | 12 ++++++++++++
include/hw/core/cpu.h | 13 +------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index de5f444b19..cd1d7328a1 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -7,6 +7,18 @@
#include "exec/hwaddr.h"
#endif
+/**
+ * vaddr:
+ * Type wide enough to contain any #target_ulong virtual address.
+ */
+typedef uint64_t vaddr;
+#define VADDR_PRId PRId64
+#define VADDR_PRIu PRIu64
+#define VADDR_PRIo PRIo64
+#define VADDR_PRIx PRIx64
+#define VADDR_PRIX PRIX64
+#define VADDR_MAX UINT64_MAX
+
/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
* when intptr_t is 32-bit and we are aligning a long long.
*/
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 76ab3b851c..3f2b681281 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -22,6 +22,7 @@
#include "hw/qdev-core.h"
#include "disas/dis-asm.h"
+#include "exec/cpu-common.h"
#include "exec/hwaddr.h"
#include "exec/memattrs.h"
#include "qapi/qapi-types-run-state.h"
@@ -35,18 +36,6 @@
typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
void *opaque);
-/**
- * vaddr:
- * Type wide enough to contain any #target_ulong virtual address.
- */
-typedef uint64_t vaddr;
-#define VADDR_PRId PRId64
-#define VADDR_PRIu PRIu64
-#define VADDR_PRIo PRIo64
-#define VADDR_PRIx PRIx64
-#define VADDR_PRIX PRIX64
-#define VADDR_MAX UINT64_MAX
-
/**
* SECTION:cpu
* @section_id: QEMU-cpu
--
2.34.1
- [PATCH v2 00/21] softmmu: Make various objects target agnostic, Philippe Mathieu-Daudé, 2022/02/03
- [PATCH v2 03/21] exec: Declare vaddr as a generic target-agnostic type,
Philippe Mathieu-Daudé <=
- [PATCH v2 04/21] exec: Make cpu_memory_rw_debug() target agnostic, Philippe Mathieu-Daudé, 2022/02/03
- [PATCH v2 05/21] sysemu/memory_mapping: Become target-agnostic, Philippe Mathieu-Daudé, 2022/02/03
- [PATCH v2 07/21] accel/kvm: Simplify user-mode #ifdef'ry, Philippe Mathieu-Daudé, 2022/02/03
- [PATCH v2 08/21] accel/hax: Introduce CONFIG_HAX_IS_POSSIBLE, Philippe Mathieu-Daudé, 2022/02/03
- [PATCH v2 09/21] softmmu/cpus: Code movement, Philippe Mathieu-Daudé, 2022/02/03
- [PATCH v2 06/21] sysemu/kvm: Make kvm_on_sigbus() / kvm_on_sigbus_vcpu() target agnostic, Philippe Mathieu-Daudé, 2022/02/03