Commit bb0b6f39 authored by Max Filippov's avatar Max Filippov Committed by Michael Tokarev
Browse files

hw/xtensa: sim: use g_string/g_new 



Replace malloc/free/sprintf with g_string/g_string_printf/g_string_free.
Replace g_malloc with g_new when allocating the MemoryRegion to get more
type safety.

Suggested-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 95e9a242

hw/xtensa/sim.c

+5 −5
Original line number Diff line number Diff line
@@ -41,21 +41,21 @@ static void xtensa_create_memory_regions(const XtensaMemory *memory, 
                                         const char *name)

{

    unsigned i;

    char *num_name = malloc(strlen(name) + sizeof(i) * 3 + 1);

    GString *num_name = g_string_new(NULL);



    for (i = 0; i < memory->num; ++i) {

        MemoryRegion *m;



        sprintf(num_name, "%s%u", name, i);

        m = g_malloc(sizeof(*m));

        memory_region_init_ram(m, NULL, num_name,

        g_string_printf(num_name, "%s%u", name, i);

        m = g_new(MemoryRegion, 1);

        memory_region_init_ram(m, NULL, num_name->str,

                               memory->location[i].size,

                               &error_fatal);

        vmstate_register_ram_global(m);

        memory_region_add_subregion(get_system_memory(),

                                    memory->location[i].addr, m);

    }

    free(num_name);

    g_string_free(num_name, true);

}



static uint64_t translate_phys_addr(void *opaque, uint64_t addr)