[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/17] s390x: Adjust internal kvm code
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 13/17] s390x: Adjust internal kvm code |
Date: |
Fri, 15 Apr 2011 17:32:54 +0200 |
We're now finally emulating an s390x CPU, so we can move quite some logic
from the kvm code out into generic CPU code.
This patch does this and adjusts the interfaces according to what the code
around now expects to be able to call.
Signed-off-by: Alexander Graf <address@hidden>
---
target-s390x/kvm.c | 44 +++++++-------------------------------------
1 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 2643460..b68749b 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -49,13 +49,6 @@
#define DIAG_KVM_HYPERCALL 0x500
#define DIAG_KVM_BREAKPOINT 0x501
-#define SCP_LENGTH 0x00
-#define SCP_FUNCTION_CODE 0x02
-#define SCP_CONTROL_MASK 0x03
-#define SCP_RESPONSE_CODE 0x06
-#define SCP_MEM_CODE 0x08
-#define SCP_INCREMENT 0x0a
-
#define ICPT_INSTRUCTION 0x04
#define ICPT_WAITPSW 0x1c
#define ICPT_SOFT_INTERCEPT 0x24
@@ -228,9 +221,9 @@ static void enter_pgmcheck(CPUState *env, uint16_t code)
kvm_s390_interrupt(env, KVM_S390_PROGRAM_INT, code);
}
-static void setcc(CPUState *env, uint64_t cc)
+static inline void setcc(CPUState *env, uint64_t cc)
{
- env->kvm_run->psw_mask &= ~(3ul << 44);
+ env->kvm_run->psw_mask &= ~(3ull << 44);
env->kvm_run->psw_mask |= (cc & 3) << 44;
env->psw.mask &= ~(3ul << 44);
@@ -248,35 +241,11 @@ static int kvm_sclp_service_call(CPUState *env, struct
kvm_run *run,
sccb = env->regs[ipbh0 & 0xf];
code = env->regs[(ipbh0 & 0xf0) >> 4];
- dprintf("sclp(0x%x, 0x%lx)\n", sccb, code);
-
- if (sccb & ~0x7ffffff8ul) {
- fprintf(stderr, "KVM: invalid sccb address 0x%x\n", sccb);
- r = -1;
- goto out;
- }
-
- switch(code) {
- case SCLP_CMDW_READ_SCP_INFO:
- case SCLP_CMDW_READ_SCP_INFO_FORCED:
- stw_phys(sccb + SCP_MEM_CODE, ram_size >> 20);
- stb_phys(sccb + SCP_INCREMENT, 1);
- stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);
- setcc(env, 0);
-
- kvm_s390_interrupt_internal(env, KVM_S390_INT_SERVICE,
- sccb & ~3, 0, 1);
- break;
- default:
- dprintf("KVM: invalid sclp call 0x%x / 0x%lx\n", sccb, code);
- r = -1;
- break;
- }
-
-out:
- if (r < 0) {
+ r = sclp_service_call(env, sccb, code);
+ if (r) {
setcc(env, 3);
}
+
return 0;
}
@@ -449,7 +418,8 @@ static int handle_intercept(CPUState *env)
int icpt_code = run->s390_sieic.icptcode;
int r = 0;
- dprintf("intercept: 0x%x (at 0x%lx)\n", icpt_code, env->kvm_run->psw_addr);
+ dprintf("intercept: 0x%x (at 0x%lx)\n", icpt_code,
+ (long)env->kvm_run->psw_addr);
switch (icpt_code) {
case ICPT_INSTRUCTION:
r = handle_instruction(env, run);
--
1.6.0.2
- [Qemu-devel] [PATCH 04/17] linux-user: add s390x to llseek list, (continued)
- [Qemu-devel] [PATCH 04/17] linux-user: add s390x to llseek list, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 09/17] s390x: virtio machine storage keys, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 03/17] linux-user: define a couple of syscalls for non-uid16 targets, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 05/17] kvm: add kvm stub for arch specific stuff, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 08/17] s390x: Dispatch interrupts to KVM or the real CPU, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 13/17] s390x: Adjust internal kvm code,
Alexander Graf <=
- [Qemu-devel] [PATCH 01/17] tcg: extend max tcg opcodes on 32bit, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 06/17] s390x: Prepare cpu.h for emulation, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 07/17] s390x: Enable s390x-softmmu target, Alexander Graf, 2011/04/15
- [Qemu-devel] [PATCH 10/17] s390x: keep hint on virtio managing size, Alexander Graf, 2011/04/15