memory: Get rid of address_space_init_shareable

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>
This commit is contained in:
Alexey Kardashevskiy 2017-09-21 18:51:08 +10:00 committed by Paolo Bonzini
parent 5e8fd947e2
commit b516572f31
7 changed files with 19 additions and 58 deletions

5
cpus.c
View File

@ -1764,8 +1764,9 @@ void qemu_init_vcpu(CPUState *cpu)
/* If the target cpu hasn't set up any address spaces itself, /* If the target cpu hasn't set up any address spaces itself,
* give it the default one. * give it the default one.
*/ */
AddressSpace *as = address_space_init_shareable(cpu->memory, AddressSpace *as = g_new0(AddressSpace, 1);
"cpu-memory");
address_space_init(as, cpu->memory, "cpu-memory");
cpu->num_ases = 1; cpu->num_ases = 1;
cpu_address_space_init(cpu, as, 0); cpu_address_space_init(cpu, as, 0);
} }

View File

@ -41,7 +41,7 @@ static MemTxResult bitband_read(void *opaque, hwaddr offset,
/* Find address in underlying memory and round down to multiple of size */ /* Find address in underlying memory and round down to multiple of size */
addr = bitband_addr(s, offset) & (-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) { if (res) {
return 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 */ /* Find address in underlying memory and round down to multiple of size */
addr = bitband_addr(s, offset) & (-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) { if (res) {
return res; return res;
} }
@ -79,7 +79,7 @@ static MemTxResult bitband_write(void *opaque, hwaddr offset, uint64_t value,
} else { } else {
buf[bitpos >> 3] &= ~bit; 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 = { static const MemoryRegionOps bitband_ops = {
@ -111,8 +111,7 @@ static void bitband_realize(DeviceState *dev, Error **errp)
return; return;
} }
s->source_as = address_space_init_shareable(s->source_memory, address_space_init(&s->source_as, s->source_memory, "bitband-source");
"bitband-source");
} }
/* Board init. */ /* Board init. */

View File

@ -309,8 +309,6 @@ struct AddressSpace {
struct rcu_head rcu; struct rcu_head rcu;
char *name; char *name;
MemoryRegion *root; MemoryRegion *root;
int ref_count;
bool malloced;
/* Accessed via RCU. */ /* Accessed via RCU. */
struct FlatView *current_map; struct FlatView *current_map;
@ -1585,23 +1583,6 @@ MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
*/ */
void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name); 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 * address_space_destroy: destroy an address space
* *

View File

@ -21,7 +21,7 @@ typedef struct {
SysBusDevice parent_obj; SysBusDevice parent_obj;
/*< public >*/ /*< public >*/
AddressSpace *source_as; AddressSpace source_as;
MemoryRegion iomem; MemoryRegion iomem;
uint32_t base; uint32_t base;
MemoryRegion *source_memory; MemoryRegion *source_memory;

View File

@ -2722,9 +2722,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)
{ {
memory_region_ref(root); memory_region_ref(root);
memory_region_transaction_begin(); memory_region_transaction_begin();
as->ref_count = 1;
as->root = root; as->root = root;
as->malloced = false;
as->current_map = NULL; as->current_map = NULL;
as->ioeventfd_nb = 0; as->ioeventfd_nb = 0;
as->ioeventfds = NULL; as->ioeventfds = NULL;
@ -2737,37 +2735,18 @@ void address_space_init(AddressSpace *as, MemoryRegion *root, const char *name)
static void do_address_space_destroy(AddressSpace *as) static void do_address_space_destroy(AddressSpace *as)
{ {
bool do_free = as->malloced;
assert(QTAILQ_EMPTY(&as->listeners)); assert(QTAILQ_EMPTY(&as->listeners));
flatview_unref(as->current_map); flatview_unref(as->current_map);
g_free(as->name); g_free(as->name);
g_free(as->ioeventfds); g_free(as->ioeventfds);
memory_region_unref(as->root); 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) void address_space_destroy(AddressSpace *as)
{ {
MemoryRegion *root = as->root; MemoryRegion *root = as->root;
as->ref_count--;
if (as->ref_count) {
return;
}
/* Flush out anything from MemoryListeners listening in on this */ /* Flush out anything from MemoryListeners listening in on this */
memory_region_transaction_begin(); memory_region_transaction_begin();
as->root = NULL; as->root = NULL;

View File

@ -684,6 +684,9 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
int pagebits; int pagebits;
Error *local_err = NULL; Error *local_err = NULL;
#ifndef CONFIG_USER_ONLY
AddressSpace *as;
#endif
cpu_exec_realizefn(cs, &local_err); cpu_exec_realizefn(cs, &local_err);
if (local_err != NULL) { if (local_err != NULL) {
@ -874,24 +877,21 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
if (cpu->has_el3 || arm_feature(env, ARM_FEATURE_M_SECURITY)) { if (cpu->has_el3 || arm_feature(env, ARM_FEATURE_M_SECURITY)) {
AddressSpace *as; as = g_new0(AddressSpace, 1);
cs->num_ases = 2; cs->num_ases = 2;
if (!cpu->secure_memory) { if (!cpu->secure_memory) {
cpu->secure_memory = cs->memory; cpu->secure_memory = cs->memory;
} }
as = address_space_init_shareable(cpu->secure_memory, address_space_init(as, cpu->secure_memory, "cpu-secure-memory");
"cpu-secure-memory");
cpu_address_space_init(cs, as, ARMASIdx_S); cpu_address_space_init(cs, as, ARMASIdx_S);
} else { } else {
cs->num_ases = 1; cs->num_ases = 1;
} }
as = g_new0(AddressSpace, 1);
cpu_address_space_init(cs, address_space_init(as, cs->memory, "cpu-memory");
address_space_init_shareable(cs->memory, cpu_address_space_init(cs, as, ARMASIdx_NS);
"cpu-memory"),
ARMASIdx_NS);
#endif #endif
qemu_init_vcpu(cs); qemu_init_vcpu(cs);

View File

@ -3738,10 +3738,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
if (tcg_enabled()) { if (tcg_enabled()) {
AddressSpace *as_normal = address_space_init_shareable(cs->memory, AddressSpace *as_normal = g_new0(AddressSpace, 1);
"cpu-memory");
AddressSpace *as_smm = g_new(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_mem = g_new(MemoryRegion, 1);
cpu->cpu_as_root = g_new(MemoryRegion, 1); cpu->cpu_as_root = g_new(MemoryRegion, 1);