From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtIcC-00027o-7M for qemu-devel@nongnu.org; Fri, 15 May 2015 12:37:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtIc9-00015a-HX for qemu-devel@nongnu.org; Fri, 15 May 2015 12:37:36 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:32810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtIc9-00015V-7C for qemu-devel@nongnu.org; Fri, 15 May 2015 12:37:33 -0400 Received: by wicmx19 with SMTP id mx19so42716302wic.0 for ; Fri, 15 May 2015 09:37:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 15 May 2015 18:36:57 +0200 Message-Id: <1431707823-51230-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1431707823-51230-1-git-send-email-pbonzini@redhat.com> References: <1431707823-51230-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/7] kvm-all: put kvm_mem_flags to more work List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Andrew Jones , lersek@redhat.com, avi.kivity@gmail.com, kraxel@redhat.com From: Andrew Jones Currently kvm_mem_flags just translates bools to bits, let's make it also determine the bools first. This avoids its parameter list growing each time we add a flag. Signed-off-by: Andrew Jones Signed-off-by: Paolo Bonzini --- kvm-all.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 5ad4877..6e1a3f8 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -295,10 +295,14 @@ err: * dirty pages logging control */ -static int kvm_mem_flags(KVMState *s, bool log_dirty, bool readonly) +static int kvm_mem_flags(MemoryRegion *mr) { + bool readonly = mr->readonly || memory_region_is_romd(mr); int flags = 0; - flags = log_dirty ? KVM_MEM_LOG_DIRTY_PAGES : 0; + + if (memory_region_is_logging(mr)) { + flags |= KVM_MEM_LOG_DIRTY_PAGES; + } if (readonly && kvm_readonly_mem_allowed) { flags |= KVM_MEM_READONLY; } @@ -313,7 +317,10 @@ static int kvm_slot_dirty_pages_log_change(KVMSlot *mem, bool log_dirty) old_flags = mem->flags; - flags = (mem->flags & ~mask) | kvm_mem_flags(s, log_dirty, false); + flags = mem->flags & ~mask; + if (log_dirty) { + flags |= KVM_MEM_LOG_DIRTY_PAGES; + } mem->flags = flags; /* If nothing changed effectively, no need to issue ioctl */ @@ -663,9 +670,7 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) KVMSlot *mem, old; int err; MemoryRegion *mr = section->mr; - bool log_dirty = memory_region_is_logging(mr); bool writeable = !mr->readonly && !mr->rom_device; - bool readonly_flag = mr->readonly || memory_region_is_romd(mr); hwaddr start_addr = section->offset_within_address_space; ram_addr_t size = int128_get64(section->size); void *ram = NULL; @@ -709,7 +714,7 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) (ram - start_addr == mem->ram - mem->start_addr)) { /* The new slot fits into the existing one and comes with * identical parameters - update flags and done. */ - kvm_slot_dirty_pages_log_change(mem, log_dirty); + kvm_slot_dirty_pages_log_change(mem, memory_region_is_logging(mr)); return; } @@ -742,7 +747,7 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) mem->memory_size = old.memory_size; mem->start_addr = old.start_addr; mem->ram = old.ram; - mem->flags = kvm_mem_flags(s, log_dirty, readonly_flag); + mem->flags = kvm_mem_flags(mr); err = kvm_set_user_memory_region(s, mem); if (err) { @@ -763,7 +768,7 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) mem->memory_size = start_addr - old.start_addr; mem->start_addr = old.start_addr; mem->ram = old.ram; - mem->flags = kvm_mem_flags(s, log_dirty, readonly_flag); + mem->flags = kvm_mem_flags(mr); err = kvm_set_user_memory_region(s, mem); if (err) { @@ -787,7 +792,7 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) size_delta = mem->start_addr - old.start_addr; mem->memory_size = old.memory_size - size_delta; mem->ram = old.ram + size_delta; - mem->flags = kvm_mem_flags(s, log_dirty, readonly_flag); + mem->flags = kvm_mem_flags(mr); err = kvm_set_user_memory_region(s, mem); if (err) { @@ -809,7 +814,7 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) mem->memory_size = size; mem->start_addr = start_addr; mem->ram = ram; - mem->flags = kvm_mem_flags(s, log_dirty, readonly_flag); + mem->flags = kvm_mem_flags(mr); err = kvm_set_user_memory_region(s, mem); if (err) { -- 1.8.3.1