[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/20] s390x/kvm: pass the SIGP instruction parameter
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 04/20] s390x/kvm: pass the SIGP instruction parameter to the SIGP handler |
Date: |
Tue, 10 Mar 2015 09:37:57 +0100 |
From: David Hildenbrand <address@hidden>
The parameter of the SIGP instruction will be neded in the future. Let's read it
out and store it in the struct sigp_info, so it can be passed to the sigp
handlers.
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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 8918986..aaf703e 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1113,6 +1113,7 @@ static int handle_diag(S390CPU *cpu, struct kvm_run *run,
uint32_t ipb)
typedef struct SigpInfo {
S390CPU *cpu;
+ uint64_t param;
int cc;
uint64_t *status_reg;
} SigpInfo;
@@ -1174,10 +1175,11 @@ static void sigp_cpu_reset(void *arg)
}
static int handle_sigp_single_dst(S390CPU *dst_cpu, uint8_t order,
- uint64_t *status_reg)
+ uint64_t param, uint64_t *status_reg)
{
SigpInfo si = {
.cpu = dst_cpu,
+ .param = param,
.status_reg = status_reg,
};
@@ -1218,6 +1220,7 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run,
uint8_t ipa1)
int ret;
uint8_t order;
uint64_t *status_reg;
+ uint64_t param;
S390CPU *dst_cpu = NULL;
cpu_synchronize_state(CPU(cpu));
@@ -1225,6 +1228,7 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run,
uint8_t ipa1)
/* get order code */
order = decode_basedisp_rs(env, run->s390_sieic.ipb) & SIGP_ORDER_MASK;
status_reg = &env->regs[r1];
+ param = (r1 % 2) ? env->regs[r1] : env->regs[r1 + 1];
switch (order) {
case SIGP_SET_ARCH:
@@ -1235,7 +1239,7 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run,
uint8_t ipa1)
default:
/* all other sigp orders target a single vcpu */
dst_cpu = s390_cpu_addr2state(env->regs[r3]);
- ret = handle_sigp_single_dst(dst_cpu, order, status_reg);
+ ret = handle_sigp_single_dst(dst_cpu, order, param, status_reg);
}
if (ret >= 0) {
--
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, 2015/03/10
- [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 <=
- [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
- [Qemu-devel] [PULL 03/20] s390x/kvm: more details for SIGP handler with one destination vcpu, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 09/20] s390x: add function to deliver restart irqs, Christian Borntraeger, 2015/03/10