summaryrefslogtreecommitdiff
path: root/target-s390x/gen-features.c
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2016-09-05 10:52:37 +0200
committerCornelia Huck <cornelia.huck@de.ibm.com>2016-09-06 17:06:51 +0200
commit07059effd14e1cb6497f711e905c55affa525677 (patch)
tree88c62661b4bcdb09f648e7bea6ccb466741a2466 /target-s390x/gen-features.c
parent34821036cd10e8ae9061338bcb6c8777781d07e9 (diff)
downloadqemu-07059effd14e1cb6497f711e905c55affa525677.tar.gz
s390x/kvm: let the CPU model control CMM(A)
Starting with recent kernels, if the cmma attributes are available, we actually have hardware support. Enabling CMMA then means providing the guest VCPU with CMM, therefore enabling its CMM facility. Let's not blindly enable CMM anymore but let's control it using CPU models. For disabled CPU models, CMMA will continue to always get enabled. Also enable it in the applicable default models. Please note that CMM doesn't work with hugetlbfs, therefore we will warn the user and keep it disabled. Migrating from/to a hugetlbfs configuration works, as it will be disabled on both sides. Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Message-Id: <20160905085244.99980-24-dahi@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'target-s390x/gen-features.c')
-rw-r--r--target-s390x/gen-features.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/target-s390x/gen-features.c b/target-s390x/gen-features.c
index dfc7659ce5..e674738ae3 100644
--- a/target-s390x/gen-features.c
+++ b/target-s390x/gen-features.c
@@ -376,6 +376,7 @@ static uint16_t full_GEN13_GA1[] = {
static uint16_t default_GEN9_GA1[] = {
S390_FEAT_STORE_HYPERVISOR_INFO,
S390_FEAT_GROUP_MSA_EXT_1,
+ S390_FEAT_CMM,
};
#define default_GEN9_GA2 EmptyFeat
#define default_GEN9_GA3 EmptyFeat