[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] s390x/cpumodel: add esop/esop2 to z12 model
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PATCH 3/7] s390x/cpumodel: add esop/esop2 to z12 model |
Date: |
Thu, 13 Jul 2017 18:03:05 +0200 |
From: "Jason J. Herne" <address@hidden>
Add esop and esop2 features to z12 model where esop2 was originally introduced.
Provide a mechanism to disable features in compatibility machines and use this
method to disable esop and esop2 when using compatibility machine v2.9 or
earlier.
Signed-off-by: Jason J. Herne <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 3 +++
target/s390x/gen-features.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index e484aed..657a45f 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -30,6 +30,7 @@
#include "hw/s390x/s390-virtio-ccw.h"
#include "hw/s390x/css-bridge.h"
#include "migration/register.h"
+#include "cpu_models.h"
static const char *const reset_dev_types[] = {
TYPE_VIRTUAL_CSS_BRIDGE,
@@ -503,6 +504,8 @@ DEFINE_CCW_MACHINE(2_10, "2.10", true);
static void ccw_machine_2_9_instance_options(MachineState *machine)
{
ccw_machine_2_10_instance_options(machine);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_ESOP);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2);
s390_cpudef_featoff_greater(12, 1, S390_FEAT_ZPCI);
s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_INT_SUPPRESSION);
s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_EVENT_NOTIFICATION);
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 33404e4..af14b11 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -429,6 +429,7 @@ static uint16_t full_GEN12_GA1[] = {
S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
S390_FEAT_ADAPTER_INT_SUPPRESSION,
S390_FEAT_EDAT_2,
+ S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,
};
static uint16_t full_GEN12_GA2[] = {
@@ -488,6 +489,8 @@ static uint16_t default_GEN12_GA1[] = {
S390_FEAT_ZPCI,
S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
S390_FEAT_EDAT_2,
+ S390_FEAT_ESOP,
+ S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,
};
#define default_GEN12_GA2 EmptyFeat
--
2.7.4
- [Qemu-devel] [PATCH 0/7] s390: remaining patches, Christian Borntraeger, 2017/07/13
- [Qemu-devel] [PATCH 7/7] s390x/gdb: add gs registers, Christian Borntraeger, 2017/07/13
- [Qemu-devel] [PATCH 6/7] s390x/arch_dump: also dump guarded storage control block, Christian Borntraeger, 2017/07/13
- [Qemu-devel] [PATCH 4/7] s390x/kvm: Enable KSS facility for nested virtualization, Christian Borntraeger, 2017/07/13
- [Qemu-devel] [PATCH 1/7] s390x/cpumodel: wire up new hardware features, Christian Borntraeger, 2017/07/13
- [Qemu-devel] [PATCH 3/7] s390x/cpumodel: add esop/esop2 to z12 model,
Christian Borntraeger <=
- [Qemu-devel] [PATCH 5/7] s390x/kvm: enable guarded storage, Christian Borntraeger, 2017/07/13
- [Qemu-devel] [PATCH 2/7] s390x/cpumodel: we are always in zarchitecture mode, Christian Borntraeger, 2017/07/13
- Re: [Qemu-devel] [PATCH 0/7] s390: remaining patches, Cornelia Huck, 2017/07/14