diff options
| author | David Hildenbrand | 2016-09-05 10:52:25 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2016-09-06 17:06:50 +0200 |
| commit | 7c72ac49ae9f38fa0125296e05988655157decb5 (patch) | |
| tree | ce2386176bfa5eb51d1e96c76f4ba49c65f1d155 /target-s390x/machine.c | |
| parent | s390x/cpumodel: expose features and feature groups as properties (diff) | |
| download | qemu-7c72ac49ae9f38fa0125296e05988655157decb5.tar.gz qemu-7c72ac49ae9f38fa0125296e05988655157decb5.tar.xz qemu-7c72ac49ae9f38fa0125296e05988655157decb5.zip | |
s390x/cpumodel: let the CPU model handle feature checks
If we have certain features enabled, we have to migrate additional state
(e.g. vector registers or runtime-instrumentation registers). Let the
CPU model control that unless we have no "host" CPU model in the KVM
case. This will later on be the case for compatibility machines, so
migration from QEMU versions without the CPU model will still work.
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-12-dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'target-s390x/machine.c')
| -rw-r--r-- | target-s390x/machine.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/target-s390x/machine.c b/target-s390x/machine.c index aa39e5daa4..edc3a4717b 100644 --- a/target-s390x/machine.c +++ b/target-s390x/machine.c @@ -78,12 +78,7 @@ 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; + return s390_has_feat(S390_FEAT_VECTOR); } static const VMStateDescription vmstate_vregs = { @@ -147,12 +142,7 @@ 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; + return s390_has_feat(S390_FEAT_RUNTIME_INSTRUMENTATION); } const VMStateDescription vmstate_riccb = { |