On Wed, 13 Dec 2017 18:15:12 +0100
David Hildenbrand <da...@redhat.com> wrote:
> As Cornelia noticed, -cpu qemu will not boot on a z12 machine. Don't
> enable z13 features as default for now (as we are emulating a z12 in
> TCG for now).
>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
> ---
> target/s390x/gen-features.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index deace660e1..b24f6ada5b 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -570,13 +570,14 @@ static uint16_t qemu_LATEST[] = {
> S390_FEAT_STFLE_49,
> S390_FEAT_LOCAL_TLB_CLEARING,
> S390_FEAT_INTERLOCKED_ACCESS_2,
> - S390_FEAT_STFLE_53,
> S390_FEAT_MSA_EXT_4,
> S390_FEAT_MSA_EXT_3,
> };
>
> /* add all new definitions before this point */
> static uint16_t qemu_MAX[] = {
> + /* z13+ features */
> + S390_FEAT_STFLE_53,
> /* generates a dependency warning, leave it out for now */
> S390_FEAT_MSA_EXT_5,
> };
Squashed into "s390x: change the QEMU cpu model to a stripped down z12"
and pushed out to s390-next.
