From c2cd627ddb13f62557aaf66305edb03cc3d9612d Mon Sep 17 00:00:00 2001 From: Cao jin Date: Mon, 12 Sep 2016 14:34:56 +0800 Subject: 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: Paolo Bonzini Signed-off-by: Cao jin Message-Id: <1473662096-32598-1-git-send-email-caoj.fnst@cn.fujitsu.com> Signed-off-by: Paolo Bonzini --- exec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index ce3fb9ec8e..c81d5ab981 100644 --- a/exec.c +++ b/exec.c @@ -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); - } } } -- cgit v1.2.3-55-g7522