summaryrefslogtreecommitdiffstats
path: root/target/avr
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2022-02-14 17:08:40 +0100
committerPhilippe Mathieu-Daudé2022-03-06 22:23:09 +0100
commit9295b1aa92d3efb3c08b71ee751fbfd83ea02f4d (patch)
tree4fc23f148c4cd422edfa02cf3b0e3217a7ed37bb /target/avr
parenttarget: Use CPUArchState as interface to target-specific CPU state (diff)
downloadqemu-9295b1aa92d3efb3c08b71ee751fbfd83ea02f4d.tar.gz
qemu-9295b1aa92d3efb3c08b71ee751fbfd83ea02f4d.tar.xz
qemu-9295b1aa92d3efb3c08b71ee751fbfd83ea02f4d.zip
target: Introduce and use OBJECT_DECLARE_CPU_TYPE() macro
Replace the boilerplate code to declare CPU QOM types and macros, and forward-declare the CPU instance type. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20220214183144.27402-14-f4bug@amsat.org>
Diffstat (limited to 'target/avr')
-rw-r--r--target/avr/cpu-qom.h3
-rw-r--r--target/avr/cpu.h6
2 files changed, 3 insertions, 6 deletions
diff --git a/target/avr/cpu-qom.h b/target/avr/cpu-qom.h
index 14e5b3ce72..32a1c762e6 100644
--- a/target/avr/cpu-qom.h
+++ b/target/avr/cpu-qom.h
@@ -26,8 +26,7 @@
#define TYPE_AVR_CPU "avr-cpu"
-OBJECT_DECLARE_TYPE(AVRCPU, AVRCPUClass,
- AVR_CPU)
+OBJECT_DECLARE_CPU_TYPE(AVRCPU, AVRCPUClass, AVR_CPU)
/**
* AVRCPUClass:
diff --git a/target/avr/cpu.h b/target/avr/cpu.h
index e4a990556b..a833799fc1 100644
--- a/target/avr/cpu.h
+++ b/target/avr/cpu.h
@@ -143,14 +143,14 @@ typedef struct CPUArchState {
*
* A AVR CPU.
*/
-typedef struct AVRCPU {
+struct AVRCPU {
/*< private >*/
CPUState parent_obj;
/*< public >*/
CPUNegativeOffsetState neg;
CPUAVRState env;
-} AVRCPU;
+};
extern const struct VMStateDescription vms_avr_cpu;
@@ -245,8 +245,6 @@ bool avr_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
MMUAccessType access_type, int mmu_idx,
bool probe, uintptr_t retaddr);
-typedef AVRCPU ArchCPU;
-
#include "exec/cpu-all.h"
#endif /* !defined (QEMU_AVR_CPU_H) */