From 348710ce46ee2ddf02396aad4bd3978c6dfc2a07 Mon Sep 17 00:00:00 2001

From: Marcel Apfelbaum <marcel.a@redhat.com>

Date: Sun, 19 Jan 2014 13:07:35 +0100

Subject: [PATCH 10/11] exec: change well-known physical sections to macros

RH-Author: Marcel Apfelbaum <marcel.a@redhat.com>

Message-id: <1390136856-7024-2-git-send-email-marcel.a@redhat.com>

Patchwork-id: 56810

O-Subject: [RHEL-7 qemu-kvm PATCH v2 1/2] exec: change well-known physical sections to macros

Bugzilla: 1003535

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

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

RH-Acked-by: Markus Armbruster <armbru@redhat.com>

From: Liu Ping Fan <qemulist@gmail.com>

Sections like phys_section_unassigned always have fixed address

in phys_sections.  Declared as macro, so we can use them

when having more than one phys_sections array.

Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>

Signed-off-by: Liu Ping Fan <qemulist@gmail.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit b41aac4f0d17000babd815e088699d58e59917b8)

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>

Conflicts:

	exec.c

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>

---

 exec.c | 42 ++++++++++++++++++++++++------------------

 1 file changed, 24 insertions(+), 18 deletions(-)

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

---

 exec.c |   42 ++++++++++++++++++++++++------------------

 1 files changed, 24 insertions(+), 18 deletions(-)

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

index b16ef4a..01c74cd 100644

--- a/exec.c

+++ b/exec.c

@@ -101,10 +101,10 @@ struct AddressSpaceDispatch {

 static MemoryRegionSection *phys_sections;

 static unsigned phys_sections_nb, phys_sections_nb_alloc;

-static uint16_t phys_section_unassigned;

-static uint16_t phys_section_notdirty;

-static uint16_t phys_section_rom;

-static uint16_t phys_section_watch;

+#define PHYS_SECTION_UNASSIGNED 0

+#define PHYS_SECTION_NOTDIRTY 1

+#define PHYS_SECTION_ROM 2

+#define PHYS_SECTION_WATCH 3

 /* Simple allocator for PhysPageEntry nodes */

 static PhysPageEntry (*phys_map_nodes)[L2_SIZE];

@@ -168,7 +168,7 @@ static void phys_page_set_level(PhysPageEntry *lp, hwaddr *index,

         if (level == 0) {

             for (i = 0; i < L2_SIZE; i++) {

                 p[i].is_leaf = 1;

-                p[i].ptr = phys_section_unassigned;

+                p[i].ptr = PHYS_SECTION_UNASSIGNED;

             }

         }

     } else {

@@ -204,7 +204,7 @@ MemoryRegionSection *phys_page_find(AddressSpaceDispatch *d, hwaddr index)

     PhysPageEntry lp = d->phys_map;

     PhysPageEntry *p;

     int i;

-    uint16_t s_index = phys_section_unassigned;

+    uint16_t s_index = PHYS_SECTION_UNASSIGNED;

     for (i = P_L2_LEVELS - 1; i >= 0 && !lp.is_leaf; i--) {

         if (lp.ptr == PHYS_MAP_NODE_NIL) {

@@ -646,9 +646,9 @@ hwaddr memory_region_section_get_iotlb(CPUArchState *env,

         iotlb = (memory_region_get_ram_addr(section->mr) & TARGET_PAGE_MASK)

             + memory_region_section_addr(section, paddr);

         if (!section->readonly) {

-            iotlb |= phys_section_notdirty;

+            iotlb |= PHYS_SECTION_NOTDIRTY;

         } else {

-            iotlb |= phys_section_rom;

+            iotlb |= PHYS_SECTION_ROM;

         }

     } else {

         /* IO handlers are currently passed a physical address.

@@ -667,7 +667,7 @@ hwaddr memory_region_section_get_iotlb(CPUArchState *env,

         if (vaddr == (wp->vaddr & TARGET_PAGE_MASK)) {

             /* Avoid trapping reads of pages with a write breakpoint. */

             if ((prot & PAGE_WRITE) || (wp->flags & BP_MEM_READ)) {

-                iotlb = phys_section_watch + paddr;

+                iotlb = PHYS_SECTION_WATCH + paddr;

                 *address |= TLB_MMIO;

                 break;

             }

@@ -1722,7 +1722,7 @@ static subpage_t *subpage_init(hwaddr base)

     printf("%s: %p base " TARGET_FMT_plx " len %08x %d\n", __func__,

            mmio, base, TARGET_PAGE_SIZE, subpage_memory);

 #endif

-    subpage_register(mmio, 0, TARGET_PAGE_SIZE-1, phys_section_unassigned);

+    subpage_register(mmio, 0, TARGET_PAGE_SIZE-1, PHYS_SECTION_UNASSIGNED);

     return mmio;

 }

@@ -1768,11 +1768,17 @@ static void mem_begin(MemoryListener *listener)

 static void core_begin(MemoryListener *listener)

 {

+    uint16_t n;

+

     phys_sections_clear();

-    phys_section_unassigned = dummy_section(&io_mem_unassigned);

-    phys_section_notdirty = dummy_section(&io_mem_notdirty);

-    phys_section_rom = dummy_section(&io_mem_rom);

-    phys_section_watch = dummy_section(&io_mem_watch);

+    n = dummy_section(&io_mem_unassigned);

+    assert(n == PHYS_SECTION_UNASSIGNED);

+    n = dummy_section(&io_mem_notdirty);

+    assert(n == PHYS_SECTION_NOTDIRTY);

+    n = dummy_section(&io_mem_rom);

+    assert(n == PHYS_SECTION_ROM);

+    n = dummy_section(&io_mem_watch);

+    assert(n == PHYS_SECTION_WATCH);

 }

 static void tcg_commit(MemoryListener *listener)

@@ -2440,7 +2446,7 @@ void stl_phys_notdirty(hwaddr addr, uint32_t val)

     if (!memory_region_is_ram(section->mr) || section->readonly) {

         addr = memory_region_section_addr(section, addr);

         if (memory_region_is_ram(section->mr)) {

-            section = &phys_sections[phys_section_rom];

+            section = &phys_sections[PHYS_SECTION_ROM];

         }

         io_mem_write(section->mr, addr, val, 4);

     } else {

@@ -2473,7 +2479,7 @@ void stq_phys_notdirty(hwaddr addr, uint64_t val)

     if (!memory_region_is_ram(section->mr) || section->readonly) {

         addr = memory_region_section_addr(section, addr);

         if (memory_region_is_ram(section->mr)) {

-            section = &phys_sections[phys_section_rom];

+            section = &phys_sections[PHYS_SECTION_ROM];

         }

 #ifdef TARGET_WORDS_BIGENDIAN

         io_mem_write(section->mr, addr, val >> 32, 4);

@@ -2502,7 +2508,7 @@ static inline void stl_phys_internal(hwaddr addr, uint32_t val,

     if (!memory_region_is_ram(section->mr) || section->readonly) {

         addr = memory_region_section_addr(section, addr);

         if (memory_region_is_ram(section->mr)) {

-            section = &phys_sections[phys_section_rom];

+            section = &phys_sections[PHYS_SECTION_ROM];

         }

 #if defined(TARGET_WORDS_BIGENDIAN)

         if (endian == DEVICE_LITTLE_ENDIAN) {

@@ -2569,7 +2575,7 @@ static inline void stw_phys_internal(hwaddr addr, uint32_t val,

     if (!memory_region_is_ram(section->mr) || section->readonly) {

         addr = memory_region_section_addr(section, addr);

         if (memory_region_is_ram(section->mr)) {

-            section = &phys_sections[phys_section_rom];

+            section = &phys_sections[PHYS_SECTION_ROM];

         }

 #if defined(TARGET_WORDS_BIGENDIAN)

         if (endian == DEVICE_LITTLE_ENDIAN) {

-- 

1.7.1