Commit c2cd627d authored by Cao jin's avatar Cao jin Committed by Paolo Bonzini
Browse files

kvm-all: drop kvm_setup_guest_memory 



kvm_setup_guest_memory only does "madvise to QEMU_MADV_DONTFORK" and
is only called by ram_block_add, which actually is duplicate code.
Bonus: add simple comment for kvm_has_sync_mmu to make life easier.

Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
Message-Id: <1473662096-32598-1-git-send-email-caoj.fnst@cn.fujitsu.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a952c186

exec.c

+1 −3
Original line number Diff line number Diff line
@@ -1621,10 +1621,8 @@ static void ram_block_add(RAMBlock *new_block, Error **errp) 
    if (new_block->host) {

        qemu_ram_setup_dump(new_block->host, new_block->max_length);

        qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_HUGEPAGE);

        /* MADV_DONTFORK is also needed by KVM in absence of synchronous MMU */

        qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_DONTFORK);

        if (kvm_enabled()) {

            kvm_setup_guest_memory(new_block->host, new_block->max_length);

        }

    }

}

include/sysemu/kvm.h

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ int kvm_destroy_vcpu(CPUState *cpu); 
#ifdef NEED_CPU_H

#include "cpu.h"



void kvm_setup_guest_memory(void *start, size_t size);

void kvm_flush_coalesced_mmio_buffer(void);



int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr,

kvm-all.c

+1 −14
Original line number Diff line number Diff line
@@ -2148,6 +2148,7 @@ void kvm_device_access(int fd, int group, uint64_t attr, 
    }

}



/* Return 1 on success, 0 on failure */

int kvm_has_sync_mmu(void)

{

    return kvm_check_extension(kvm_state, KVM_CAP_SYNC_MMU);
@@ -2190,20 +2191,6 @@ int kvm_has_intx_set_mask(void) 
    return kvm_state->intx_set_mask;

}



void kvm_setup_guest_memory(void *start, size_t size)

{

    if (!kvm_has_sync_mmu()) {

        int ret = qemu_madvise(start, size, QEMU_MADV_DONTFORK);



        if (ret) {

            perror("qemu_madvise");

            fprintf(stderr,

                    "Need MADV_DONTFORK in absence of synchronous KVM MMU\n");

            exit(1);

        }

    }

}



#ifdef KVM_CAP_SET_GUEST_DEBUG

struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu,

                                                 target_ulong pc)

kvm-stub.c

+0 −4
Original line number Diff line number Diff line
@@ -73,10 +73,6 @@ int kvm_has_many_ioeventfds(void) 
    return 0;

}



void kvm_setup_guest_memory(void *start, size_t size)

{

}



int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)

{

    return -ENOSYS;