Revision 7267c094 memory.c
b/memory.c | ||
---|---|---|
183 | 183 |
{ |
184 | 184 |
if (view->nr == view->nr_allocated) { |
185 | 185 |
view->nr_allocated = MAX(2 * view->nr, 10); |
186 |
view->ranges = qemu_realloc(view->ranges,
|
|
186 |
view->ranges = g_realloc(view->ranges,
|
|
187 | 187 |
view->nr_allocated * sizeof(*view->ranges)); |
188 | 188 |
} |
189 | 189 |
memmove(view->ranges + pos + 1, view->ranges + pos, |
... | ... | |
194 | 194 |
|
195 | 195 |
static void flatview_destroy(FlatView *view) |
196 | 196 |
{ |
197 |
qemu_free(view->ranges);
|
|
197 |
g_free(view->ranges);
|
|
198 | 198 |
} |
199 | 199 |
|
200 | 200 |
static bool can_merge(FlatRange *r1, FlatRange *r2) |
... | ... | |
553 | 553 |
fr->addr.start - fr->offset_in_region); |
554 | 554 |
if (addrrange_intersects(fr->addr, tmp)) { |
555 | 555 |
++ioeventfd_nb; |
556 |
ioeventfds = qemu_realloc(ioeventfds,
|
|
556 |
ioeventfds = g_realloc(ioeventfds,
|
|
557 | 557 |
ioeventfd_nb * sizeof(*ioeventfds)); |
558 | 558 |
ioeventfds[ioeventfd_nb-1] = fr->mr->ioeventfds[i]; |
559 | 559 |
ioeventfds[ioeventfd_nb-1].addr = tmp; |
... | ... | |
564 | 564 |
address_space_add_del_ioeventfds(as, ioeventfds, ioeventfd_nb, |
565 | 565 |
as->ioeventfds, as->ioeventfd_nb); |
566 | 566 |
|
567 |
qemu_free(as->ioeventfds);
|
|
567 |
g_free(as->ioeventfds);
|
|
568 | 568 |
as->ioeventfds = ioeventfds; |
569 | 569 |
as->ioeventfd_nb = ioeventfd_nb; |
570 | 570 |
} |
... | ... | |
713 | 713 |
QTAILQ_INIT(&mr->subregions); |
714 | 714 |
memset(&mr->subregions_link, 0, sizeof mr->subregions_link); |
715 | 715 |
QTAILQ_INIT(&mr->coalesced); |
716 |
mr->name = qemu_strdup(name);
|
|
716 |
mr->name = g_strdup(name);
|
|
717 | 717 |
mr->dirty_log_mask = 0; |
718 | 718 |
mr->ioeventfd_nb = 0; |
719 | 719 |
mr->ioeventfds = NULL; |
... | ... | |
949 | 949 |
assert(QTAILQ_EMPTY(&mr->subregions)); |
950 | 950 |
mr->destructor(mr); |
951 | 951 |
memory_region_clear_coalescing(mr); |
952 |
qemu_free((char *)mr->name);
|
|
953 |
qemu_free(mr->ioeventfds);
|
|
952 |
g_free((char *)mr->name);
|
|
953 |
g_free(mr->ioeventfds);
|
|
954 | 954 |
} |
955 | 955 |
|
956 | 956 |
uint64_t memory_region_size(MemoryRegion *mr) |
... | ... | |
1061 | 1061 |
target_phys_addr_t offset, |
1062 | 1062 |
uint64_t size) |
1063 | 1063 |
{ |
1064 |
CoalescedMemoryRange *cmr = qemu_malloc(sizeof(*cmr));
|
|
1064 |
CoalescedMemoryRange *cmr = g_malloc(sizeof(*cmr));
|
|
1065 | 1065 |
|
1066 | 1066 |
cmr->addr = addrrange_make(offset, size); |
1067 | 1067 |
QTAILQ_INSERT_TAIL(&mr->coalesced, cmr, link); |
... | ... | |
1075 | 1075 |
while (!QTAILQ_EMPTY(&mr->coalesced)) { |
1076 | 1076 |
cmr = QTAILQ_FIRST(&mr->coalesced); |
1077 | 1077 |
QTAILQ_REMOVE(&mr->coalesced, cmr, link); |
1078 |
qemu_free(cmr);
|
|
1078 |
g_free(cmr);
|
|
1079 | 1079 |
} |
1080 | 1080 |
memory_region_update_coalesced_range(mr); |
1081 | 1081 |
} |
... | ... | |
1102 | 1102 |
} |
1103 | 1103 |
} |
1104 | 1104 |
++mr->ioeventfd_nb; |
1105 |
mr->ioeventfds = qemu_realloc(mr->ioeventfds,
|
|
1105 |
mr->ioeventfds = g_realloc(mr->ioeventfds,
|
|
1106 | 1106 |
sizeof(*mr->ioeventfds) * mr->ioeventfd_nb); |
1107 | 1107 |
memmove(&mr->ioeventfds[i+1], &mr->ioeventfds[i], |
1108 | 1108 |
sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb-1 - i)); |
... | ... | |
1135 | 1135 |
memmove(&mr->ioeventfds[i], &mr->ioeventfds[i+1], |
1136 | 1136 |
sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb - (i+1))); |
1137 | 1137 |
--mr->ioeventfd_nb; |
1138 |
mr->ioeventfds = qemu_realloc(mr->ioeventfds,
|
|
1138 |
mr->ioeventfds = g_realloc(mr->ioeventfds,
|
|
1139 | 1139 |
sizeof(*mr->ioeventfds)*mr->ioeventfd_nb + 1); |
1140 | 1140 |
memory_region_update_topology(); |
1141 | 1141 |
} |
Also available in: Unified diff