From f6f56692227952864edcb0dc841cde6238470cf8 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cohuck@redhat.com>
Date: Mon, 21 Jan 2019 17:05:59 +0100
Subject: [PATCH 14/14] s390x: Return specification exception for unimplemented
 diag 308 subcodes

RH-Author: Cornelia Huck <cohuck@redhat.com>
Message-id: <20190121170559.19471-1-cohuck@redhat.com>
Patchwork-id: 84074
O-Subject: [RHEL-7.6.z qemu-kvm-ma PATCH] s390x: Return specification exception for unimplemented diag 308 subcodes
Bugzilla: 1668424
RH-Acked-by: Thomas Huth <thuth@redhat.com>
RH-Acked-by: David Hildenbrand <david@redhat.com>
RH-Acked-by: John Snow <jsnow@redhat.com>

From: Janosch Frank <frankja@linux.ibm.com>

The architecture specifies specification exceptions for all
unavailable subcodes.

The presence of subcodes is indicated by checking some query subcode.
For example 6 will indicate that 3-6 are available. So future systems
might call new subcodes to check for new features. This should not
trigger a hw error, instead we return the architectured specification
exception.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Cc: qemu-stable@nongnu.org
Message-Id: <20190111113657.66195-3-frankja@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
(cherry picked from commit 37dbd1f4d4805edcd18d94eb202bb3461b3cd52d)
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
 target/s390x/diag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index a755837..50b58df 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -182,7 +182,7 @@ out:
         }
         return;
     default:
-        hw_error("Unhandled diag308 subcode %" PRIx64, subcode);
+        s390_program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO, ra);
         break;
     }
 }
-- 
1.8.3.1