Commit b516572f authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Paolo Bonzini
Browse files

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: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Message-Id: <20170921085110.25598-17-aik@ozlabs.ru>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5e8fd947

cpus.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

    }

hw/arm/armv7m.c

+4 −5
Original line number Diff line number Diff line
@@ -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 = {
@@ -111,8 +111,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.  */

include/exec/memory.h

+0 −19
Original line number Diff line number Diff line
@@ -309,8 +309,6 @@ struct AddressSpace { 
    struct rcu_head rcu;

    char *name;

    MemoryRegion *root;

    int ref_count;

    bool malloced;



    /* Accessed via RCU.  */

    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);



/**

 * 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

 *

include/hw/arm/armv7m.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ typedef struct { 
    SysBusDevice parent_obj;

    /*< public >*/



    AddressSpace *source_as;

    AddressSpace source_as;

    MemoryRegion iomem;

    uint32_t base;

    MemoryRegion *source_memory;

memory.c

+0 −21
Original line number Diff line number Diff line
@@ -2722,9 +2722,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;
@@ -2737,37 +2735,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;