[Qemu-devel] [PATCH 34/49] hw: move CPU state serialization to migration/cpu.h

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 34/49] hw: move CPU state serialization to migration/cpu.h
Date: Wed, 16 Mar 2016 11:46:44 +0100	[thread overview]
Message-ID: <1458125219-131698-35-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com>

Remove usage of NEED_CPU_H from hw/hw.h.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/hw/hw.h           | 49 -----------------------------------------------
 include/migration/cpu.h   | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 target-alpha/machine.c    |  1 +
 target-arm/machine.c      |  1 +
 target-cris/machine.c     |  1 +
 target-i386/machine.c     |  1 +
 target-lm32/machine.c     |  1 +
 target-mips/machine.c     |  2 +-
 target-moxie/machine.c    |  1 +
 target-openrisc/machine.c |  1 +
 target-ppc/machine.c      |  1 +
 target-sparc/machine.c    |  1 +
 12 files changed, 58 insertions(+), 50 deletions(-)
 create mode 100644 include/migration/cpu.h

diff --git a/include/hw/hw.h b/include/hw/hw.h
index 2cb69d5..0456fc3 100644
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -14,28 +14,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 
-#ifdef NEED_CPU_H
-#if TARGET_LONG_BITS == 64
-#define qemu_put_betl qemu_put_be64
-#define qemu_get_betl qemu_get_be64
-#define qemu_put_betls qemu_put_be64s
-#define qemu_get_betls qemu_get_be64s
-#define qemu_put_sbetl qemu_put_sbe64
-#define qemu_get_sbetl qemu_get_sbe64
-#define qemu_put_sbetls qemu_put_sbe64s
-#define qemu_get_sbetls qemu_get_sbe64s
-#else
-#define qemu_put_betl qemu_put_be32
-#define qemu_get_betl qemu_get_be32
-#define qemu_put_betls qemu_put_be32s
-#define qemu_get_betls qemu_get_be32s
-#define qemu_put_sbetl qemu_put_sbe32
-#define qemu_get_sbetl qemu_get_sbe32
-#define qemu_put_sbetls qemu_put_sbe32s
-#define qemu_get_sbetls qemu_get_sbe32s
-#endif
-#endif
-
 typedef void QEMUResetHandler(void *opaque);
 
 void qemu_register_reset(QEMUResetHandler *func, void *opaque);
@@ -43,31 +21,4 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque);
 
 void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
 
-#ifdef NEED_CPU_H
-#if TARGET_LONG_BITS == 64
-#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
-    VMSTATE_UINT64_V(_f, _s, _v)
-#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \
-    VMSTATE_UINT64_EQUAL_V(_f, _s, _v)
-#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \
-    VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v)
-#define vmstate_info_uinttl vmstate_info_uint64
-#else
-#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
-    VMSTATE_UINT32_V(_f, _s, _v)
-#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \
-    VMSTATE_UINT32_EQUAL_V(_f, _s, _v)
-#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \
-    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v)
-#define vmstate_info_uinttl vmstate_info_uint32
-#endif
-#define VMSTATE_UINTTL(_f, _s)                                        \
-    VMSTATE_UINTTL_V(_f, _s, 0)
-#define VMSTATE_UINTTL_EQUAL(_f, _s)                                  \
-    VMSTATE_UINTTL_EQUAL_V(_f, _s, 0)
-#define VMSTATE_UINTTL_ARRAY(_f, _s, _n)                              \
-    VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0)
-
-#endif
-
 #endif
diff --git a/include/migration/cpu.h b/include/migration/cpu.h
new file mode 100644
index 0000000..f3abbab
--- /dev/null
+++ b/include/migration/cpu.h
@@ -0,0 +1,48 @@
+/* Declarations for use for CPU state serialization.  */
+#ifndef MIGRATION_CPU_H
+#define MIGRATION_CPU_H
+
+#if TARGET_LONG_BITS == 64
+#define qemu_put_betl qemu_put_be64
+#define qemu_get_betl qemu_get_be64
+#define qemu_put_betls qemu_put_be64s
+#define qemu_get_betls qemu_get_be64s
+#define qemu_put_sbetl qemu_put_sbe64
+#define qemu_get_sbetl qemu_get_sbe64
+#define qemu_put_sbetls qemu_put_sbe64s
+#define qemu_get_sbetls qemu_get_sbe64s
+
+#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
+    VMSTATE_UINT64_V(_f, _s, _v)
+#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \
+    VMSTATE_UINT64_EQUAL_V(_f, _s, _v)
+#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \
+    VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v)
+#define vmstate_info_uinttl vmstate_info_uint64
+#else
+#define qemu_put_betl qemu_put_be32
+#define qemu_get_betl qemu_get_be32
+#define qemu_put_betls qemu_put_be32s
+#define qemu_get_betls qemu_get_be32s
+#define qemu_put_sbetl qemu_put_sbe32
+#define qemu_get_sbetl qemu_get_sbe32
+#define qemu_put_sbetls qemu_put_sbe32s
+#define qemu_get_sbetls qemu_get_sbe32s
+
+#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
+    VMSTATE_UINT32_V(_f, _s, _v)
+#define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \
+    VMSTATE_UINT32_EQUAL_V(_f, _s, _v)
+#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \
+    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v)
+#define vmstate_info_uinttl vmstate_info_uint32
+#endif
+
+#define VMSTATE_UINTTL(_f, _s)                                        \
+    VMSTATE_UINTTL_V(_f, _s, 0)
+#define VMSTATE_UINTTL_EQUAL(_f, _s)                                  \
+    VMSTATE_UINTTL_EQUAL_V(_f, _s, 0)
+#define VMSTATE_UINTTL_ARRAY(_f, _s, _n)                              \
+    VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0)
+
+#endif
diff --git a/target-alpha/machine.c b/target-alpha/machine.c
index 9ab0928..3f72943 100644
--- a/target-alpha/machine.c
+++ b/target-alpha/machine.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
+#include "migration/cpu.h"
 
 static int get_fpcr(QEMUFile *f, void *opaque, size_t size)
 {
diff --git a/target-arm/machine.c b/target-arm/machine.c
index 03a73d9..c23feb1 100644
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@ -5,6 +5,7 @@
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
 #include "internals.h"
+#include "migration/cpu.h"
 
 static bool vfp_needed(void *opaque)
 {
diff --git a/target-cris/machine.c b/target-cris/machine.c
index 9cc2820..4c9287f 100644
--- a/target-cris/machine.c
+++ b/target-cris/machine.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
+#include "migration/cpu.h"
 
 static const VMStateDescription vmstate_tlbset = {
     .name = "cpu/tlbset",
diff --git a/target-i386/machine.c b/target-i386/machine.c
index ee5b949..57203b2 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -3,6 +3,7 @@
 #include "hw/boards.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
+#include "migration/cpu.h"
 
 #include "cpu.h"
 #include "sysemu/kvm.h"
diff --git a/target-lm32/machine.c b/target-lm32/machine.c
index 91c943d..6f56216 100644
--- a/target-lm32/machine.c
+++ b/target-lm32/machine.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
+#include "migration/cpu.h"
 
 static const VMStateDescription vmstate_env = {
     .name = "env",
diff --git a/target-mips/machine.c b/target-mips/machine.c
index 737f3c2..e7b2cf9 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -1,7 +1,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-
 #include "cpu.h"
+#include "migration/cpu.h"
 
 static int cpu_post_load(void *opaque, int version_id)
 {
diff --git a/target-moxie/machine.c b/target-moxie/machine.c
index 912b791..7810e1c 100644
--- a/target-moxie/machine.c
+++ b/target-moxie/machine.c
@@ -2,6 +2,7 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "machine.h"
+#include "migration/cpu.h"
 
 const VMStateDescription vmstate_moxie_cpu = {
     .name = "cpu",
diff --git a/target-openrisc/machine.c b/target-openrisc/machine.c
index b4dc08d..bd5d50f 100644
--- a/target-openrisc/machine.c
+++ b/target-openrisc/machine.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
+#include "migration/cpu.h"
 
 static const VMStateDescription vmstate_env = {
     .name = "env",
diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index 692121e..2ea29dd 100644
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -4,6 +4,7 @@
 #include "sysemu/kvm.h"
 #include "helper_regs.h"
 #include "mmu-hash64.h"
+#include "migration/cpu.h"
 
 static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
 {
diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index 1046016..04806f6 100644
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -4,6 +4,7 @@
 #include "qemu/timer.h"
 
 #include "cpu.h"
+#include "migration/cpu.h"
 
 #ifdef TARGET_SPARC64
 static const VMStateDescription vmstate_cpu_timer = {
-- 
1.8.3.1

next prev parent reply	other threads:[~2016-03-16 10:47 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16 10:46 [Qemu-devel] [PATCH for-2.7 00/49] NEED_CPU_H and cpu.h cleanups Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 01/49] include: move CPU-related definitions out of qemu-common.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 02/49] log: do not use CONFIG_USER_ONLY Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 03/49] hw: explicitly include qemu-common.h and cpu.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 04/49] cpu: make cpu-qom.h only include-able from cpu.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 05/49] target-alpha: make cpu-qom.h not target specific Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 06/49] target-arm: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 07/49] target-cris: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 08/49] target-i386: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 09/49] target-lm32: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 10/49] target-m68k: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 11/49] target-microblaze: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 12/49] target-mips: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 13/49] target-ppc: do not use target_ulong in cpu-qom.h Paolo Bonzini
2016-03-16 13:02   ` Peter Maydell
2016-03-16 10:46 ` [Qemu-devel] [PATCH 14/49] target-ppc: make cpu-qom.h not target specific Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 15/49] target-s390x: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 16/49] target-sh4: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 17/49] target-sparc: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 18/49] target-tricore: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 19/49] target-unicore32: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 20/49] target-xtensa: " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 21/49] arm: include cpu-qom.h in files that require ARMCPU Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 22/49] m68k: include cpu-qom.h in files that require M68KCPU Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 23/49] sh4: include cpu-qom.h in files that require SuperHCPU Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 24/49] alpha: include cpu-qom.h in files that require AlphaCPU Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 25/49] mips: use MIPSCPU instead of CPUMIPSState Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 26/49] ppc: use PowerPCCPU instead of CPUPPCState Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 27/49] arm: remove useless cpu.h inclusion Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 28/49] explicitly include qom/cpu.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 29/49] explicitly include hw/qdev-core.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 30/49] explicitly include linux/kvm.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 31/49] apic: move target-dependent definitions to cpu.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 32/49] include: poison symbols in osdep.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 33/49] hw: do not use VMSTATE_*TL Paolo Bonzini
2016-03-16 10:46 ` Paolo Bonzini [this message]
2016-03-16 10:46 ` [Qemu-devel] [PATCH 35/49] hw: cannot include hw/hw.h from user emulation Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 36/49] cpu: move endian-dependent load/store functions to cpu-all.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 37/49] qemu-common: stop including qemu/bswap.h from qemu-common.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 38/49] qemu-common: stop including qemu/host-utils.h " Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 39/49] gdbstub: remove includes from gdbstub-xml.c Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 40/49] dma: do not depend on kvm_enabled() Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 41/49] s390x: move stuff out of cpu.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 42/49] qemu-common: push cpu.h inclusion out of qemu-common.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 43/49] arm: move arm_log_exception into .c file Paolo Bonzini
2016-03-16 11:18   ` Peter Maydell
2016-03-16 10:46 ` [Qemu-devel] [PATCH 44/49] mips: move CP0 functions out of cpu.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 45/49] hw: explicitly include qemu/log.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 46/49] exec: extract exec/tb-context.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 47/49] cpu: move exec-all.h inclusion out of cpu.h Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 48/49] hw: remove pio_addr_t Paolo Bonzini
2016-03-16 11:16   ` Peter Maydell
2016-03-16 11:21     ` Paolo Bonzini
2016-03-16 10:46 ` [Qemu-devel] [PATCH 49/49] hw: clean up hw/hw.h includes Paolo Bonzini

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:2cb69d5 dfblob:0456fc3 dfblob:f3abbab dfblob:9ab0928
dfblob:3f72943 dfblob:03a73d9 dfblob:c23feb1 dfblob:9cc2820
dfblob:4c9287f dfblob:ee5b949 dfblob:57203b2 dfblob:91c943d
dfblob:6f56216 dfblob:737f3c2 dfblob:e7b2cf9 dfblob:912b791
dfblob:7810e1c dfblob:b4dc08d dfblob:bd5d50f dfblob:692121e
dfblob:2ea29dd dfblob:1046016 dfblob:04806f6 )
 OR (
bs:"[Qemu-devel] [PATCH 34/49] hw: move CPU state serialization to migration/cpu.h" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458125219-131698-35-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).