Commit 7e680753 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Avi Kivity
Browse files

kvm: fill in padding to help valgrind 



valgrind warns about padding fields which are passed
to vcpu ioctls uninitialized.
This is not an error in practice because kvm ignored padding.
Since the ioctls in question are off data path and
the cost is zero anyway, initialize padding to 0
to suppress these errors.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 5d17c0d2

kvm-all.c

+2 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size) 


        zone.addr = start;

        zone.size = size;

        zone.pad = 0;



        ret = kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone);

    }
@@ -465,6 +466,7 @@ int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size) 


        zone.addr = start;

        zone.size = size;

        zone.pad = 0;



        ret = kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone);

    }

target-i386/kvm.c

+6 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ int kvm_arch_init_vcpu(CPUState *env) 


    qemu_add_vm_change_state_handler(cpu_update_state, env);



    cpuid_data.cpuid.padding = 0;

    r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);

    if (r) {

        return r;
@@ -740,6 +741,7 @@ static void set_seg(struct kvm_segment *lhs, const SegmentCache *rhs) 
    lhs->g = (flags & DESC_G_MASK) != 0;

    lhs->avl = (flags & DESC_AVL_MASK) != 0;

    lhs->unusable = 0;

    lhs->padding = 0;

}



static void get_seg(SegmentCache *lhs, const struct kvm_segment *rhs)
@@ -919,8 +921,10 @@ static int kvm_put_sregs(CPUState *env) 


    sregs.idt.limit = env->idt.limit;

    sregs.idt.base = env->idt.base;

    memset(sregs.idt.padding, 0, sizeof sregs.idt.padding);

    sregs.gdt.limit = env->gdt.limit;

    sregs.gdt.base = env->gdt.base;

    memset(sregs.gdt.padding, 0, sizeof sregs.gdt.padding);



    sregs.cr0 = env->cr[0];

    sregs.cr2 = env->cr[2];
@@ -1392,6 +1396,7 @@ static int kvm_put_vcpu_events(CPUState *env, int level) 
    events.exception.nr = env->exception_injected;

    events.exception.has_error_code = env->has_error_code;

    events.exception.error_code = env->error_code;

    events.exception.pad = 0;



    events.interrupt.injected = (env->interrupt_injected >= 0);

    events.interrupt.nr = env->interrupt_injected;
@@ -1400,6 +1405,7 @@ static int kvm_put_vcpu_events(CPUState *env, int level) 
    events.nmi.injected = env->nmi_injected;

    events.nmi.pending = env->nmi_pending;

    events.nmi.masked = !!(env->hflags2 & HF2_NMI_MASK);

    events.nmi.pad = 0;



    events.sipi_vector = env->sipi_vector;