From 75afdffa4545d7e21ce969961dca2394f6fd2213 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Sun, 4 Mar 2018 02:08:25 -0500 Subject: [PATCH] memory: Move FlatView allocation to a helper This moves a FlatView allocation and initialization to a helper. While we are nere, replace g_new with g_new0 to not to bother if we add new fields in the future. This should cause no behavioural change. Backports commit de7e6815b84c797cbda56dc96fcacaf5f37d3a20 from qemu --- qemu/memory.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qemu/memory.c b/qemu/memory.c index 820638e8..3577cc14 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -288,12 +288,14 @@ static bool flatrange_equal(FlatRange *a, FlatRange *b) && a->readonly == b->readonly; } -static void flatview_init(FlatView *view) +static FlatView *flatview_new(void) { + FlatView *view; + + view = g_new0(FlatView, 1); view->ref = 1; - view->ranges = NULL; - view->nr = 0; - view->nr_allocated = 0; + + return view; } /* Insert a range into a given position. Caller is responsible for maintaining @@ -664,8 +666,7 @@ static FlatView *generate_memory_topology(MemoryRegion *mr) { FlatView *view; - view = g_new(FlatView, 1); - flatview_init(view); + view = flatview_new(); if (mr) { render_memory_region(view, mr, int128_zero(), @@ -1804,8 +1805,7 @@ void address_space_init(struct uc_struct *uc, AddressSpace *as, MemoryRegion *ro as->uc = uc; as->root = root; as->malloced = false; - as->current_map = g_new(FlatView, 1); - flatview_init(as->current_map); + as->current_map = flatview_new(); QTAILQ_INIT(&as->listeners); QTAILQ_INSERT_TAIL(&uc->address_spaces, as, address_spaces_link); as->name = g_strdup(name ? name : "anonymous");