Blame SOURCES/kvm-memory-cpu_physical_memory_get_dirty-is-used-as-retu.patch

0a122b
From 0a833a763d5ab1da11f11303e96b0c56100ce2b9 Mon Sep 17 00:00:00 2001
0a122b
From: Juan Quintela <quintela@redhat.com>
0a122b
Date: Tue, 14 Jan 2014 15:07:34 +0100
0a122b
Subject: [PATCH 23/40] memory: cpu_physical_memory_get_dirty() is used as returning a bool
0a122b
0a122b
RH-Author: Juan Quintela <quintela@redhat.com>
0a122b
Message-id: <1389712071-23303-24-git-send-email-quintela@redhat.com>
0a122b
Patchwork-id: 56676
0a122b
O-Subject: [RHEL7 qemu-kvm PATCH 23/40] memory: cpu_physical_memory_get_dirty() is used as returning a bool
0a122b
Bugzilla: 997559
0a122b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
0a122b
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
0a122b
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
0a122b
0a122b
Signed-off-by: Juan Quintela <quintela@redhat.com>
0a122b
Reviewed-by: Eric Blake <eblake@redhat.com>
0a122b
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
0a122b
(cherry picked from commit 94833c896d2d339571a66542f2715b1897d70fa7)
0a122b
Signed-off-by: Juan Quintela <quintela@trasno.org>
0a122b
---
0a122b
 include/exec/memory-internal.h | 15 ++++++++-------
0a122b
 1 file changed, 8 insertions(+), 7 deletions(-)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 include/exec/memory-internal.h |   15 ++++++++-------
0a122b
 1 files changed, 8 insertions(+), 7 deletions(-)
0a122b
0a122b
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
0a122b
index 9099561..f27b830 100644
0a122b
--- a/include/exec/memory-internal.h
0a122b
+++ b/include/exec/memory-internal.h
0a122b
@@ -49,11 +49,10 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);
0a122b
 void qemu_ram_free(ram_addr_t addr);
0a122b
 void qemu_ram_free_from_ptr(ram_addr_t addr);
0a122b
 
0a122b
-static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
0a122b
-                                                ram_addr_t length,
0a122b
-                                                unsigned client)
0a122b
+static inline bool cpu_physical_memory_get_dirty(ram_addr_t start,
0a122b
+                                                 ram_addr_t length,
0a122b
+                                                 unsigned client)
0a122b
 {
0a122b
-    int ret = 0;
0a122b
     ram_addr_t addr, end;
0a122b
 
0a122b
     assert(client < DIRTY_MEMORY_NUM);
0a122b
@@ -61,10 +60,12 @@ static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
0a122b
     end = TARGET_PAGE_ALIGN(start + length);
0a122b
     start &= TARGET_PAGE_MASK;
0a122b
     for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
0a122b
-        ret |= test_bit(addr >> TARGET_PAGE_BITS,
0a122b
-                        ram_list.dirty_memory[client]);
0a122b
+        if (test_bit(addr >> TARGET_PAGE_BITS,
0a122b
+                     ram_list.dirty_memory[client])) {
0a122b
+            return true;
0a122b
+        }
0a122b
     }
0a122b
-    return ret;
0a122b
+    return false;
0a122b
 }
0a122b
 
0a122b
 static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
0a122b
-- 
0a122b
1.7.1
0a122b