Revision bcec36ea target-s390x/kvm.c

b/target-s390x/kvm.c
182 182
    return 0;
183 183
}
184 184

  
185
static void kvm_s390_interrupt_internal(CPUState *env, int type, uint32_t parm,
186
                                        uint64_t parm64, int vm)
185
void kvm_s390_interrupt_internal(CPUState *env, int type, uint32_t parm,
186
                                 uint64_t parm64, int vm)
187 187
{
188 188
    struct kvm_s390_interrupt kvmint;
189 189
    int r;
......
218 218
                                token, 1);
219 219
}
220 220

  
221
static void kvm_s390_interrupt(CPUState *env, int type, uint32_t code)
221
void kvm_s390_interrupt(CPUState *env, int type, uint32_t code)
222 222
{
223 223
    kvm_s390_interrupt_internal(env, type, code, 0, 0);
224 224
}
......
237 237
    env->psw.mask |= (cc & 3) << 44;
238 238
}
239 239

  
240
static int sclp_service_call(CPUState *env, struct kvm_run *run, uint16_t ipbh0)
240
static int kvm_sclp_service_call(CPUState *env, struct kvm_run *run,
241
                                 uint16_t ipbh0)
241 242
{
242 243
    uint32_t sccb;
243 244
    uint64_t code;
......
287 288
    dprintf("KVM: PRIV: %d\n", ipa1);
288 289
    switch (ipa1) {
289 290
        case PRIV_SCLP_CALL:
290
            r = sclp_service_call(env, run, ipbh0);
291
            r = kvm_sclp_service_call(env, run, ipbh0);
291 292
            break;
292 293
        default:
293 294
            dprintf("KVM: unknown PRIV: 0x%x\n", ipa1);
......
300 301

  
301 302
static int handle_hypercall(CPUState *env, struct kvm_run *run)
302 303
{
303
    int r;
304

  
305 304
    cpu_synchronize_state(env);
306
    r = s390_virtio_hypercall(env);
305
    env->regs[2] = s390_virtio_hypercall(env, env->regs[2], env->regs[1]);
307 306

  
308
    return r;
307
    return 0;
309 308
}
310 309

  
311 310
static int handle_diag(CPUState *env, struct kvm_run *run, int ipb_code)

Also available in: Unified diff