vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x: move .needed functions for subsections to machine.c 

These functions are only used when defining subsections, so move
them there.

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Paolo Bonzini 2016-05-18 13:08:02 +02:00
parent f115a19c40
commit b01501db18
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
target-s390x/cpu.h
View File

@ -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 */

20
target-s390x/machine.c
View File

@ -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,