26ba25
From 35f8992f043687db739ccaf363b3f3686eeba398 Mon Sep 17 00:00:00 2001
26ba25
From: Thomas Huth <thuth@redhat.com>
26ba25
Date: Tue, 22 Jan 2019 17:40:28 +0000
26ba25
Subject: [PATCH 10/11] s390x: Return specification exception for unimplemented
26ba25
 diag 308 subcodes
26ba25
26ba25
RH-Author: Thomas Huth <thuth@redhat.com>
26ba25
Message-id: <1548178828-21117-2-git-send-email-thuth@redhat.com>
26ba25
Patchwork-id: 84086
26ba25
O-Subject: [RHEL8/rhel qemu-kvm PATCH 1/1] s390x: Return specification exception for unimplemented diag 308 subcodes
26ba25
Bugzilla: 1668261
26ba25
RH-Acked-by: David Hildenbrand <david@redhat.com>
26ba25
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
26ba25
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
26ba25
26ba25
From: Janosch Frank <frankja@linux.ibm.com>
26ba25
26ba25
The architecture specifies specification exceptions for all
26ba25
unavailable subcodes.
26ba25
26ba25
The presence of subcodes is indicated by checking some query subcode.
26ba25
For example 6 will indicate that 3-6 are available. So future systems
26ba25
might call new subcodes to check for new features. This should not
26ba25
trigger a hw error, instead we return the architectured specification
26ba25
exception.
26ba25
26ba25
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
26ba25
Cc: qemu-stable@nongnu.org
26ba25
Message-Id: <20190111113657.66195-3-frankja@linux.ibm.com>
26ba25
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
26ba25
Reviewed-by: David Hildenbrand <david@redhat.com>
26ba25
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
26ba25
(cherry picked from commit 37dbd1f4d4805edcd18d94eb202bb3461b3cd52d)
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 target/s390x/diag.c | 2 +-
26ba25
 1 file changed, 1 insertion(+), 1 deletion(-)
26ba25
26ba25
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
26ba25
index a755837..50b58df 100644
26ba25
--- a/target/s390x/diag.c
26ba25
+++ b/target/s390x/diag.c
26ba25
@@ -182,7 +182,7 @@ out:
26ba25
         }
26ba25
         return;
26ba25
     default:
26ba25
-        hw_error("Unhandled diag308 subcode %" PRIx64, subcode);
26ba25
+        s390_program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO, ra);
26ba25
         break;
26ba25
     }
26ba25
 }
26ba25
-- 
26ba25
1.8.3.1
26ba25