From 9695c6db4ca09b6bebcffcccfd37aae5c1845021 Mon Sep 17 00:00:00 2001

From: David Gibson <dgibson@redhat.com>

Date: Thu, 16 Nov 2017 03:07:28 +0100

Subject: [PATCH 24/30] memory: Get rid of address_space_init_shareable

RH-Author: David Gibson <dgibson@redhat.com>

Message-id: <20171116030732.8560-19-dgibson@redhat.com>

Patchwork-id: 77710

O-Subject: [PATCH 18/22] memory: Get rid of address_space_init_shareable

Bugzilla: 1481593

RH-Acked-by: Thomas Huth <thuth@redhat.com>

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

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

From: Alexey Kardashevskiy <aik@ozlabs.ru>

Since FlatViews are shared now and ASes not, this gets rid of

address_space_init_shareable().

This should cause no behavioural change.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Message-Id: <20170921085110.25598-17-aik@ozlabs.ru>

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

(cherry picked from commit b516572f31c0ea0937cd9d11d9bd72dd83809886)

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

Conflicts:

	target/arm/cpu.c

Conflicts because we don't have 1d2091bc75a "target/arm: Register

second AddressSpace for secure v8M CPUs" downstream.

Signed-off-by: David Gibson <dgibson@redhat.com>

---

 cpus.c                  |  5 +++--

 hw/arm/armv7m.c         |  9 ++++-----

 include/exec/memory.h   | 19 -------------------

 include/hw/arm/armv7m.h |  2 +-

 memory.c                | 21 ---------------------

 target/arm/cpu.c        | 15 ++++++++-------

 target/i386/cpu.c       |  5 +++--

 7 files changed, 19 insertions(+), 57 deletions(-)

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

index 9bed61e..c9a6240 100644

--- a/cpus.c

+++ b/cpus.c

@@ -1764,8 +1764,9 @@ void qemu_init_vcpu(CPUState *cpu)

         /* If the target cpu hasn't set up any address spaces itself,

          * give it the default one.

          */

-        AddressSpace *as = address_space_init_shareable(cpu->memory,

-                                                        "cpu-memory");

+        AddressSpace *as = g_new0(AddressSpace, 1);

+

+        address_space_init(as, cpu->memory, "cpu-memory");

         cpu->num_ases = 1;

         cpu_address_space_init(cpu, as, 0);

     }

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c

index c8a11f2..475a88f 100644

--- a/hw/arm/armv7m.c

+++ b/hw/arm/armv7m.c

@@ -41,7 +41,7 @@ static MemTxResult bitband_read(void *opaque, hwaddr offset,

     /* Find address in underlying memory and round down to multiple of size */

     addr = bitband_addr(s, offset) & (-size);

-    res = address_space_read(s->source_as, addr, attrs, buf, size);

+    res = address_space_read(&s->source_as, addr, attrs, buf, size);

     if (res) {

         return res;

     }

@@ -66,7 +66,7 @@ static MemTxResult bitband_write(void *opaque, hwaddr offset, uint64_t value,

     /* Find address in underlying memory and round down to multiple of size */

     addr = bitband_addr(s, offset) & (-size);

-    res = address_space_read(s->source_as, addr, attrs, buf, size);

+    res = address_space_read(&s->source_as, addr, attrs, buf, size);

     if (res) {

         return res;

     }

@@ -79,7 +79,7 @@ static MemTxResult bitband_write(void *opaque, hwaddr offset, uint64_t value,

     } else {

         buf[bitpos >> 3] &= ~bit;

     }

-    return address_space_write(s->source_as, addr, attrs, buf, size);

+    return address_space_write(&s->source_as, addr, attrs, buf, size);

 }

 static const MemoryRegionOps bitband_ops = {

@@ -117,8 +117,7 @@ static void bitband_realize(DeviceState *dev, Error **errp)

         return;

     }

-    s->source_as = address_space_init_shareable(s->source_memory,

-                                                "bitband-source");

+    address_space_init(&s->source_as, s->source_memory, "bitband-source");

 }

 /* Board init.  */

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

index 157eae6..8d772b9 100644

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

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

@@ -319,8 +319,6 @@ struct AddressSpace {

     struct rcu_head rcu;

     char *name;

     MemoryRegion *root;

-    int ref_count;

-    bool malloced;

     /* Accessed via RCU.  */

     struct FlatView *current_map;

@@ -1596,23 +1594,6 @@ MemTxResult memory_region_dispatch_write(MemoryRegion *mr,

 void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name);

 /**

- * address_space_init_shareable: return an address space for a memory region,

- *                               creating it if it does not already exist

- *

- * @root: a #MemoryRegion that routes addresses for the address space

- * @name: an address space name.  The name is only used for debugging

- *        output.

- *

- * This function will return a pointer to an existing AddressSpace

- * which was initialized with the specified MemoryRegion, or it will

- * create and initialize one if it does not already exist. The ASes

- * are reference-counted, so the memory will be freed automatically

- * when the AddressSpace is destroyed via address_space_destroy.

- */

-AddressSpace *address_space_init_shareable(MemoryRegion *root,

-                                           const char *name);

-

-/**

  * address_space_destroy: destroy an address space

  *

  * Releases all resources associated with an address space.  After an address space

diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h

index a9b3f2a..dba77df 100644

--- a/include/hw/arm/armv7m.h

+++ b/include/hw/arm/armv7m.h

@@ -21,7 +21,7 @@ typedef struct {

     SysBusDevice parent_obj;

     /*< public >*/

-    AddressSpace *source_as;

+    AddressSpace source_as;

     MemoryRegion iomem;

     uint32_t base;

     MemoryRegion *source_memory;

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

index 25a8bf2..00d5788 100644

--- a/memory.c

+++ b/memory.c

@@ -2721,9 +2721,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)

 {

     memory_region_ref(root);

     memory_region_transaction_begin();

-    as->ref_count = 1;

     as->root = root;

-    as->malloced = false;

     as->current_map = NULL;

     as->ioeventfd_nb = 0;

     as->ioeventfds = NULL;

@@ -2736,37 +2734,18 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)

 static void do_address_space_destroy(AddressSpace *as)

 {

-    bool do_free = as->malloced;

-

     assert(QTAILQ_EMPTY(&as->listeners));

     flatview_unref(as->current_map);

     g_free(as->name);

     g_free(as->ioeventfds);

     memory_region_unref(as->root);

-    if (do_free) {

-        g_free(as);

-    }

-}

-

-AddressSpace *address_space_init_shareable(MemoryRegion *root, const char *name)

-{

-    AddressSpace *as;

-

-    as = g_malloc0(sizeof *as);

-    address_space_init(as, root, name);

-    as->malloced = true;

-    return as;

 }

 void address_space_destroy(AddressSpace *as)

 {

     MemoryRegion *root = as->root;

-    as->ref_count--;

-    if (as->ref_count) {

-        return;

-    }

     /* Flush out anything from MemoryListeners listening in on this */

     memory_region_transaction_begin();

     as->root = NULL;

diff --git a/target/arm/cpu.c b/target/arm/cpu.c

index 3f90b7e..b6c8d93 100644

--- a/target/arm/cpu.c

+++ b/target/arm/cpu.c

@@ -650,6 +650,9 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)

     CPUARMState *env = &cpu->env;

     int pagebits;

     Error *local_err = NULL;

+#ifndef CONFIG_USER_ONLY

+    AddressSpace *as;

+#endif

     cpu_exec_realizefn(cs, &local_err);

     if (local_err != NULL) {

@@ -835,19 +838,17 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)

     }

     if (cpu->has_el3) {

-        AddressSpace *as;

+        as = g_new0(AddressSpace, 1);

         if (!cpu->secure_memory) {

             cpu->secure_memory = cs->memory;

         }

-        as = address_space_init_shareable(cpu->secure_memory,

-                                          "cpu-secure-memory");

+        address_space_init(as, cpu->secure_memory, "cpu-secure-memory");

         cpu_address_space_init(cs, as, ARMASIdx_S);

     }

-    cpu_address_space_init(cs,

-                           address_space_init_shareable(cs->memory,

-                                                        "cpu-memory"),

-                           ARMASIdx_NS);

+    as = g_new0(AddressSpace, 1);

+    address_space_init(as, cs->memory, "cpu-memory");

+    cpu_address_space_init(cs, as, ARMASIdx_NS);

 #endif

     qemu_init_vcpu(cs);

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index 1cae8fe..ca95336 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -3772,10 +3772,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)

 #ifndef CONFIG_USER_ONLY

     if (tcg_enabled()) {

-        AddressSpace *as_normal = address_space_init_shareable(cs->memory,

-                                                               "cpu-memory");

+        AddressSpace *as_normal = g_new0(AddressSpace, 1);

         AddressSpace *as_smm = g_new(AddressSpace, 1);

+        address_space_init(as_normal, cs->memory, "cpu-memory");

+

         cpu->cpu_as_mem = g_new(MemoryRegion, 1);

         cpu->cpu_as_root = g_new(MemoryRegion, 1);

-- 

1.8.3.1