From 36b5c84556f38421c43ee4ff213f7ab64fd66a51 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Tue, 24 Feb 2015 14:15:25 +0100 Subject: s390x/kvm: helper to set the SIGP status in SigpInfo 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 Reviewed-by: Cornelia Huck Signed-off-by: Jens Freimann Signed-off-by: David Hildenbrand Message-Id: <1424783731-43426-5-git-send-email-jfrei@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger --- target-s390x/kvm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'target-s390x/kvm.c') diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index aaf703eecd..28d26c1996 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; -- cgit v1.2.1