[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/52] s390x: move .needed functions for subsections
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 02/52] s390x: move .needed functions for subsections to machine.c |
Date: |
Thu, 19 May 2016 13:17:56 +0200 |
These functions are only used when defining subsections, so move
them there.
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-s390x/cpu.h | 26 --------------------------
target-s390x/machine.c | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 996b790..00e9f69 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -1271,32 +1271,6 @@ static inline void s390_crypto_reset(void)
}
}
-#ifdef CONFIG_KVM
-static inline bool vregs_needed(void *opaque)
-{
- if (kvm_enabled()) {
- return kvm_check_extension(kvm_state, KVM_CAP_S390_VECTOR_REGISTERS);
- }
- return 0;
-}
-static inline bool riccb_needed(void *opaque)
-{
- if (kvm_enabled()) {
- return kvm_s390_get_ri();
- }
- return 0;
-}
-#else
-static inline bool vregs_needed(void *opaque)
-{
- return 0;
-}
-static inline bool riccb_needed(void *opaque)
-{
- return 0;
-}
-#endif
-
/* machine check interruption code */
/* subclasses */
diff --git a/target-s390x/machine.c b/target-s390x/machine.c
index a30b16f..aa39e5d 100644
--- a/target-s390x/machine.c
+++ b/target-s390x/machine.c
@@ -76,6 +76,16 @@ static const VMStateDescription vmstate_fpu = {
}
};
+static bool vregs_needed(void *opaque)
+{
+#ifdef CONFIG_KVM
+ if (kvm_enabled()) {
+ return kvm_check_extension(kvm_state, KVM_CAP_S390_VECTOR_REGISTERS);
+ }
+#endif
+ return 0;
+}
+
static const VMStateDescription vmstate_vregs = {
.name = "cpu/vregs",
.version_id = 1,
@@ -135,6 +145,16 @@ static const VMStateDescription vmstate_vregs = {
}
};
+static bool riccb_needed(void *opaque)
+{
+#ifdef CONFIG_KVM
+ if (kvm_enabled()) {
+ return kvm_s390_get_ri();
+ }
+#endif
+ return 0;
+}
+
const VMStateDescription vmstate_riccb = {
.name = "cpu/riccb",
.version_id = 1,
--
1.8.3.1
- [Qemu-devel] [PULL 00/52] NEED_CPU_H cleanups, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 04/52] log: do not use CONFIG_USER_ONLY, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 05/52] cpu: make cpu-qom.h only include-able from cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 08/52] target-cris: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 06/52] target-alpha: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 03/52] include: move CPU-related definitions out of qemu-common.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 07/52] target-arm: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 02/52] s390x: move .needed functions for subsections to machine.c,
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/52] target-mips: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 01/52] scripts: add script to build QEMU and analyze inclusions, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 09/52] target-i386: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 14/52] target-ppc: do not use target_ulong in cpu-qom.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 18/52] target-sh4: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 10/52] target-lm32: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 12/52] target-microblaze: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 15/52] target-ppc: do not make PowerPCCPUClass depend on target-specific symbols, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 17/52] target-s390x: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 25/52] sh4: include cpu-qom.h in files that require SuperHCPU, Paolo Bonzini, 2016/05/19