From e2bf4a6155c08480e42afe12d5ea1ce083c35f00 Mon Sep 17 00:00:00 2001

From: Juan Quintela <quintela@redhat.com>

Date: Tue, 14 Jan 2014 15:07:44 +0100

Subject: [PATCH 33/40] memory: split cpu_physical_memory_* functions to its own include

RH-Author: Juan Quintela <quintela@redhat.com>

Message-id: <1389712071-23303-34-git-send-email-quintela@redhat.com>

Patchwork-id: 56688

O-Subject: [RHEL7 qemu-kvm PATCH 33/40] memory: split cpu_physical_memory_* functions to its own include

Bugzilla: 997559

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Orit Wasserman <owasserm@redhat.com>

RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>

All the functions that use ram_addr_t should be here.

Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

(cherry picked from commit 220c3ebddbd1ac289ae7fc64733c9501b3921d94)

Conflicts:

	exec.c

	include/exec/memory-internal.h

Conflicts due to missing upstream commits:

commit d2702032b4746515cff0bf29891a6b6decfc3d86

Author: Paolo Bonzini <pbonzini@redhat.com>

Date:   Fri May 24 11:55:06 2013 +0200

    memory: export memory_region_access_valid to exec.c

commit d197063fcf969e1269dc53c9c9e9a073f87aa3b4

Author: Paolo Bonzini <pbonzini@redhat.com>

Date:   Fri May 24 13:23:38 2013 +0200

    memory: move unassigned_mem_ops to memory.c

commit b40acf99bef69fa8ab0f9092ff162fde945eec12

Author: Jan Kiszka <jan.kiszka@siemens.com>

Date:   Mon Jun 24 10:45:09 2013 +0200

    ioport: Switch dispatching to memory core layer

commit ee983cb3cc8f856b408a272269f434cc9a82ceff

Author: Paolo Bonzini <pbonzini@redhat.com>

Date:   Tue May 14 11:47:56 2013 +0200

    exec: make qemu_get_ram_ptr private

Signed-off-by: Juan Quintela <quintela@trasno.org>

---

 cputlb.c                       |  1 +

 exec.c                         |  1 +

 include/exec/memory-internal.h | 76 ---------------------------------

 include/exec/ram_addr.h        | 97 ++++++++++++++++++++++++++++++++++++++++++

 memory.c                       |  1 +

 5 files changed, 100 insertions(+), 76 deletions(-)

 create mode 100644 include/exec/ram_addr.h

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 cputlb.c                       |    1 +

 exec.c                         |    1 +

 include/exec/memory-internal.h |   76 -------------------------------

 include/exec/ram_addr.h        |   97 ++++++++++++++++++++++++++++++++++++++++

 memory.c                       |    1 +

 5 files changed, 100 insertions(+), 76 deletions(-)

 create mode 100644 include/exec/ram_addr.h

diff --git a/cputlb.c b/cputlb.c

index 44ec9bc..7699fdd 100644

--- a/cputlb.c

+++ b/cputlb.c

@@ -26,6 +26,7 @@

 #include "exec/cputlb.h"

 #include "exec/memory-internal.h"

+#include "exec/ram_addr.h"

 //#define DEBUG_TLB

 //#define DEBUG_TLB_CHECK

diff --git a/exec.c b/exec.c

index 12adb12..b16ef4a 100644

--- a/exec.c

+++ b/exec.c

@@ -50,6 +50,7 @@

 #include "translate-all.h"

 #include "exec/memory-internal.h"

+#include "exec/ram_addr.h"

 //#define DEBUG_UNASSIGNED

 //#define DEBUG_SUBPAGE

diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h

index 327d54e..8b558bf 100644

--- a/include/exec/memory-internal.h

+++ b/include/exec/memory-internal.h

@@ -20,87 +20,11 @@

 #define MEMORY_INTERNAL_H

 #ifndef CONFIG_USER_ONLY

-#include "hw/xen/xen.h"

-

-

 typedef struct AddressSpaceDispatch AddressSpaceDispatch;

 void address_space_init_dispatch(AddressSpace *as);

 void address_space_destroy_dispatch(AddressSpace *as);

-ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

-                                   MemoryRegion *mr);

-ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);

-void qemu_ram_free(ram_addr_t addr);

-void qemu_ram_free_from_ptr(ram_addr_t addr);

-

-static inline bool cpu_physical_memory_get_dirty(ram_addr_t start,

-                                                 ram_addr_t length,

-                                                 unsigned client)

-{

-    unsigned long end, page, next;

-

-    assert(client < DIRTY_MEMORY_NUM);

-

-    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

-    page = start >> TARGET_PAGE_BITS;

-    next = find_next_bit(ram_list.dirty_memory[client], end, page);

-

-    return next < end;

-}

-

-static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,

-                                                      unsigned client)

-{

-    return cpu_physical_memory_get_dirty(addr, 1, client);

-}

-

-static inline bool cpu_physical_memory_is_clean(ram_addr_t addr)

-{

-    bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);

-    bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);

-    bool migration =

-        cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);

-    return !(vga && code && migration);

-}

-

-static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,

-                                                      unsigned client)

-{

-    assert(client < DIRTY_MEMORY_NUM);

-    set_bit(addr >> TARGET_PAGE_BITS, ram_list.dirty_memory[client]);

-}

-

-static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,

-                                                       ram_addr_t length)

-{

-    unsigned long end, page;

-

-    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

-    page = start >> TARGET_PAGE_BITS;

-    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);

-    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);

-    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_CODE], page, end - page);

-    xen_modified_memory(start, length);

-}

-

-static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,

-                                                         ram_addr_t length,

-                                                         unsigned client)

-{

-    unsigned long end, page;

-

-    assert(client < DIRTY_MEMORY_NUM);

-    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

-    page = start >> TARGET_PAGE_BITS;

-    bitmap_clear(ram_list.dirty_memory[client], page, end - page);

-}

-

-void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t length,

-                                     unsigned client);

-

 extern const IORangeOps memory_region_iorange_ops;

-

 #endif

-

 #endif

diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h

new file mode 100644

index 0000000..0caa239

--- /dev/null

+++ b/include/exec/ram_addr.h

@@ -0,0 +1,97 @@

+/*

+ * Declarations for cpu physical memory functions

+ *

+ * Copyright 2011 Red Hat, Inc. and/or its affiliates

+ *

+ * Authors:

+ *  Avi Kivity <avi@redhat.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or

+ * later.  See the COPYING file in the top-level directory.

+ *

+ */

+

+/*

+ * This header is for use by exec.c and memory.c ONLY.  Do not include it.

+ * The functions declared here will be removed soon.

+ */

+

+#ifndef RAM_ADDR_H

+#define RAM_ADDR_H

+

+#ifndef CONFIG_USER_ONLY

+#include "hw/xen/xen.h"

+

+ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

+                                   MemoryRegion *mr);

+ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);

+void qemu_ram_free(ram_addr_t addr);

+void qemu_ram_free_from_ptr(ram_addr_t addr);

+

+static inline bool cpu_physical_memory_get_dirty(ram_addr_t start,

+                                                 ram_addr_t length,

+                                                 unsigned client)

+{

+    unsigned long end, page, next;

+

+    assert(client < DIRTY_MEMORY_NUM);

+

+    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

+    page = start >> TARGET_PAGE_BITS;

+    next = find_next_bit(ram_list.dirty_memory[client], end, page);

+

+    return next < end;

+}

+

+static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,

+                                                      unsigned client)

+{

+    return cpu_physical_memory_get_dirty(addr, 1, client);

+}

+

+static inline bool cpu_physical_memory_is_clean(ram_addr_t addr)

+{

+    bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);

+    bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);

+    bool migration =

+        cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);

+    return !(vga && code && migration);

+}

+

+static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,

+                                                      unsigned client)

+{

+    assert(client < DIRTY_MEMORY_NUM);

+    set_bit(addr >> TARGET_PAGE_BITS, ram_list.dirty_memory[client]);

+}

+

+static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,

+                                                       ram_addr_t length)

+{

+    unsigned long end, page;

+

+    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

+    page = start >> TARGET_PAGE_BITS;

+    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end - page);

+    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);

+    bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_CODE], page, end - page);

+    xen_modified_memory(start, length);

+}

+

+static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,

+                                                         ram_addr_t length,

+                                                         unsigned client)

+{

+    unsigned long end, page;

+

+    assert(client < DIRTY_MEMORY_NUM);

+    end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS;

+    page = start >> TARGET_PAGE_BITS;

+    bitmap_clear(ram_list.dirty_memory[client], page, end - page);

+}

+

+void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t length,

+                                     unsigned client);

+

+#endif

+#endif

diff --git a/memory.c b/memory.c

index b49642b..685912d 100644

--- a/memory.c

+++ b/memory.c

@@ -21,6 +21,7 @@

 #include <assert.h>

 #include "exec/memory-internal.h"

+#include "exec/ram_addr.h"

 static unsigned memory_region_transaction_depth;

 static bool memory_region_update_pending;

-- 

1.7.1