Commit 7a39fe58 authored by Jan Kiszka's avatar Jan Kiszka Committed by Marcelo Tosatti
Browse files

kvm: Drop return values from kvm_arch_pre/post_run 



We do not check them, and the only arch with non-empty implementations
always returns 0 (this is also true for qemu-kvm).

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
CC: Alexander Graf <agraf@suse.de>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent db1669bc

kvm.h

+2 −3
Original line number Diff line number Diff line
@@ -99,12 +99,11 @@ int kvm_vcpu_ioctl(CPUState *env, int type, ...); 


extern const KVMCapabilityInfo kvm_arch_required_capabilities[];



int kvm_arch_post_run(CPUState *env, struct kvm_run *run);

void kvm_arch_pre_run(CPUState *env, struct kvm_run *run);

void kvm_arch_post_run(CPUState *env, struct kvm_run *run);



int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run);



int kvm_arch_pre_run(CPUState *env, struct kvm_run *run);



int kvm_arch_process_irqchip_events(CPUState *env);



int kvm_arch_get_registers(CPUState *env);

target-i386/kvm.c

+2 −6
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ int kvm_arch_get_registers(CPUState *env) 
    return 0;

}



int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)

void kvm_arch_pre_run(CPUState *env, struct kvm_run *run)

{

    /* Inject NMI */

    if (env->interrupt_request & CPU_INTERRUPT_NMI) {
@@ -1486,11 +1486,9 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) 
        DPRINTF("setting tpr\n");

        run->cr8 = cpu_get_apic_tpr(env->apic_state);

    }



    return 0;

}



int kvm_arch_post_run(CPUState *env, struct kvm_run *run)

void kvm_arch_post_run(CPUState *env, struct kvm_run *run)

{

    if (run->if_flag) {

        env->eflags |= IF_MASK;
@@ -1499,8 +1497,6 @@ int kvm_arch_post_run(CPUState *env, struct kvm_run *run) 
    }

    cpu_set_apic_tpr(env->apic_state, run->cr8);

    cpu_set_apic_base(env->apic_state, run->apic_base);



    return 0;

}



int kvm_arch_process_irqchip_events(CPUState *env)

target-ppc/kvm.c

+2 −4
Original line number Diff line number Diff line
@@ -256,14 +256,12 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) 
    return 0;

}



int kvm_arch_post_run(CPUState *env, struct kvm_run *run)

void kvm_arch_post_run(CPUState *env, struct kvm_run *run)

{

    return 0;

}



int kvm_arch_process_irqchip_events(CPUState *env)

void kvm_arch_process_irqchip_events(CPUState *env)

{

    return 0;

}



static int kvmppc_handle_halt(CPUState *env)

target-s390x/kvm.c

+2 −4
Original line number Diff line number Diff line
@@ -169,14 +169,12 @@ int kvm_arch_remove_sw_breakpoint(CPUState *env, struct kvm_sw_breakpoint *bp) 
    return 0;

}



int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)

void kvm_arch_pre_run(CPUState *env, struct kvm_run *run)

{

    return 0;

}



int kvm_arch_post_run(CPUState *env, struct kvm_run *run)

void kvm_arch_post_run(CPUState *env, struct kvm_run *run)

{

    return 0;

}



int kvm_arch_process_irqchip_events(CPUState *env)