[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/24] cpu: Introduce VMSTATE_CPU() macro for CPUStat
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 03/24] cpu: Introduce VMSTATE_CPU() macro for CPUState |
Date: |
Fri, 28 Jun 2013 17:55:25 +0200 |
To be used to embed common CPU state into CPU subclasses.
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
exec.c | 5 ++---
include/qom/cpu.h | 14 ++++++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/exec.c b/exec.c
index f99041b..0b172b4 100644
--- a/exec.c
+++ b/exec.c
@@ -330,7 +330,7 @@ static int cpu_common_post_load(void *opaque, int
version_id)
return 0;
}
-static const VMStateDescription vmstate_cpu_common = {
+const VMStateDescription vmstate_cpu_common = {
.name = "cpu_common",
.version_id = 1,
.minimum_version_id = 1,
@@ -342,8 +342,7 @@ static const VMStateDescription vmstate_cpu_common = {
VMSTATE_END_OF_LIST()
}
};
-#else
-#define vmstate_cpu_common vmstate_dummy
+
#endif
CPUState *qemu_get_cpu(int index)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 397219b..3e8cc47 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -378,4 +378,18 @@ void cpu_reset_interrupt(CPUState *cpu, int mask);
*/
void cpu_resume(CPUState *cpu);
+#ifdef CONFIG_SOFTMMU
+extern const struct VMStateDescription vmstate_cpu_common;
+#else
+#define vmstate_cpu_common vmstate_dummy
+#endif
+
+#define VMSTATE_CPU() { \
+ .name = "parent_obj", \
+ .size = sizeof(CPUState), \
+ .vmsd = &vmstate_cpu_common, \
+ .flags = VMS_STRUCT, \
+ .offset = 0, \
+}
+
#endif
--
1.8.1.4
- [Qemu-devel] [PULL 06/24] cpu: Guard cpu_{save, load}() definitions, (continued)
- [Qemu-devel] [PULL 06/24] cpu: Guard cpu_{save, load}() definitions, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 07/24] gdbstub: Simplify find_cpu(), Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 05/24] target-openrisc: Register VMStateDescription for OpenRISCCPU, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 08/24] kvm: Change kvm_cpu_synchronize_state() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 13/24] kvm: Change kvm_set_signal_mask() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 11/24] cpus: Change cpu_thread_is_idle() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 12/24] cpus: Change qemu_kvm_wait_io_event() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 01/24] cpu: Fix cpu_class_set_vmsd() documentation, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 09/24] kvm: Change cpu_synchronize_state() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 02/24] cpu: Introduce device_class_set_vmsd() helper, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 03/24] cpu: Introduce VMSTATE_CPU() macro for CPUState,
Andreas Färber <=
- [Qemu-devel] [PULL 10/24] cpu: Change cpu_exit() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 04/24] target-alpha: Register VMStateDescription for AlphaCPU, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 14/24] cpus: Change qemu_kvm_init_cpu_signals() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 16/24] kvm: Change kvm_handle_internal_error() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 18/24] gdbstub: Set gdb_set_stop_cpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 17/24] kvm: Change kvm_cpu_exec() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 19/24] cpus: Change cpu_handle_guest_debug() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 21/24] cpus: Change qemu_dummy_start_vcpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 20/24] cpus: Change qemu_kvm_start_vcpu() argument to CPUState, Andreas Färber, 2013/06/28
- [Qemu-devel] [PULL 23/24] hwaddr: Make hwaddr type usable beyond softmmu, Andreas Färber, 2013/06/28