[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/20] s390x/kvm: helper to set the SIGP status in Si
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 05/20] s390x/kvm: helper to set the SIGP status in SigpInfo |
Date: |
Tue, 10 Mar 2015 09:37:58 +0100 |
From: David Hildenbrand <address@hidden>
Whenever we set the SIGP status in the status register, we have to wipe out
the lower 4 bytes and keep the higher 4 bytes. Also the condition code will
always be set to STATUS_STORED.
Let's introduce the wrapper for SigpInfo, as this will avoid most duplicate
code in the future.
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
target-s390x/kvm.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index aaf703e..28d26c1 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1118,6 +1118,13 @@ typedef struct SigpInfo {
uint64_t *status_reg;
} SigpInfo;
+static void set_sigp_status(SigpInfo *si, uint64_t status)
+{
+ *si->status_reg &= 0xffffffff00000000ULL;
+ *si->status_reg |= status;
+ si->cc = SIGP_CC_STATUS_STORED;
+}
+
static void sigp_start(void *arg)
{
SigpInfo *si = arg;
@@ -1202,9 +1209,7 @@ static int handle_sigp_single_dst(S390CPU *dst_cpu,
uint8_t order,
break;
default:
DPRINTF("KVM: unknown SIGP: 0x%x\n", order);
- *status_reg &= 0xffffffff00000000ULL;
- *status_reg |= SIGP_STAT_INVALID_ORDER;
- si.cc = SIGP_CC_STATUS_STORED;
+ set_sigp_status(&si, SIGP_STAT_INVALID_ORDER);
}
return si.cc;
--
2.3.0
- [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 06/20] s390x/kvm: trace all SIGP orders, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 05/20] s390x/kvm: helper to set the SIGP status in SigpInfo,
Christian Borntraeger <=
- [Qemu-devel] [PULL 08/20] s390x/kvm: SIGP START is only applicable when STOPPED, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 04/20] s390x/kvm: pass the SIGP instruction parameter to the SIGP handler, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 10/20] s390x/kvm: deliver SIGP RESTART directly if stopped, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 02/20] s390x: introduce defines for SIGP condition codes, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 01/20] synchronize Linux headers to 4.0-rc3, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 20/20] s390-ccw: rebuild BIOS, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 11/20] s390x/kvm: enable the new SIGP handling in user space, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 16/20] s390-ccw.img: Allow bigger ramdisk sizes or offsets, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 17/20] s390-ccw.img: Reinitialize guessing on reboot, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 18/20] elf-loader: Provide the possibility to relocate s390 ELF files, Christian Borntraeger, 2015/03/10