Commit b1115c99 authored by Liran Alon's avatar Liran Alon Committed by Paolo Bonzini
Browse files

KVM: Introduce kvm_arch_destroy_vcpu() 



Simiar to how kvm_init_vcpu() calls kvm_arch_init_vcpu() to perform
arch-dependent initialisation, introduce kvm_arch_destroy_vcpu()
to be called from kvm_destroy_vcpu() to perform arch-dependent
destruction.

This was added because some architectures (Such as i386)
currently do not free memory that it have allocated in
kvm_arch_init_vcpu().

Suggested-by: default avatarMaran Wilson <maran.wilson@oracle.com>
Reviewed-by: default avatarMaran Wilson <maran.wilson@oracle.com>
Signed-off-by: default avatarLiran Alon <liran.alon@oracle.com>
Message-Id: <20190619162140.133674-3-liran.alon@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6b2341ee

accel/kvm/kvm-all.c

+5 −0
Original line number Diff line number Diff line
@@ -291,6 +291,11 @@ int kvm_destroy_vcpu(CPUState *cpu) 


    DPRINTF("kvm_destroy_vcpu\n");



    ret = kvm_arch_destroy_vcpu(cpu);

    if (ret < 0) {

        goto err;

    }



    mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);

    if (mmap_size < 0) {

        ret = mmap_size;

include/sysemu/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level); 
int kvm_arch_init(MachineState *ms, KVMState *s);



int kvm_arch_init_vcpu(CPUState *cpu);

int kvm_arch_destroy_vcpu(CPUState *cpu);



bool kvm_vcpu_id_is_valid(int vcpu_id);

target/arm/kvm32.c

+5 −0
Original line number Diff line number Diff line
@@ -240,6 +240,11 @@ int kvm_arch_init_vcpu(CPUState *cs) 
    return kvm_arm_init_cpreg_list(cpu);

}



int kvm_arch_destroy_vcpu(CPUState *cs)

{

	return 0;

}



typedef struct Reg {

    uint64_t id;

    int offset;

target/arm/kvm64.c

+5 −0
Original line number Diff line number Diff line
@@ -654,6 +654,11 @@ int kvm_arch_init_vcpu(CPUState *cs) 
    return kvm_arm_init_cpreg_list(cpu);

}



int kvm_arch_destroy_vcpu(CPUState *cs)

{

    return 0;

}



bool kvm_arm_reg_syncs_via_cpreg_list(uint64_t regidx)

{

    /* Return true if the regidx is a register we should synchronize

target/i386/kvm.c

+12 −0
Original line number Diff line number Diff line
@@ -1679,6 +1679,18 @@ int kvm_arch_init_vcpu(CPUState *cs) 
    return r;

}



int kvm_arch_destroy_vcpu(CPUState *cs)

{

    X86CPU *cpu = X86_CPU(cs);



    if (cpu->kvm_msr_buf) {

        g_free(cpu->kvm_msr_buf);

        cpu->kvm_msr_buf = NULL;

    }



    return 0;

}



void kvm_arch_reset_vcpu(X86CPU *cpu)

{

    CPUX86State *env = &cpu->env;