qcow2: Use g_try_new0() for cache array
With a variable cache size, the number given to qcow2_cache_create() may be huge. Therefore, use g_try_new0(). While at it, use g_new0() instead of g_malloc0() for allocating the Qcow2Cache object. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
440ba08aea
commit
02004bd4ba
|
@ -48,9 +48,12 @@ Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables)
|
||||||
Qcow2Cache *c;
|
Qcow2Cache *c;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
c = g_malloc0(sizeof(*c));
|
c = g_new0(Qcow2Cache, 1);
|
||||||
c->size = num_tables;
|
c->size = num_tables;
|
||||||
c->entries = g_new0(Qcow2CachedTable, num_tables);
|
c->entries = g_try_new0(Qcow2CachedTable, num_tables);
|
||||||
|
if (!c->entries) {
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < c->size; i++) {
|
for (i = 0; i < c->size; i++) {
|
||||||
c->entries[i].table = qemu_try_blockalign(bs->file, s->cluster_size);
|
c->entries[i].table = qemu_try_blockalign(bs->file, s->cluster_size);
|
||||||
|
@ -62,8 +65,10 @@ Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables)
|
||||||
return c;
|
return c;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
for (i = 0; i < c->size; i++) {
|
if (c->entries) {
|
||||||
qemu_vfree(c->entries[i].table);
|
for (i = 0; i < c->size; i++) {
|
||||||
|
qemu_vfree(c->entries[i].table);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
g_free(c->entries);
|
g_free(c->entries);
|
||||||
g_free(c);
|
g_free(c);
|
||||||
|
|
Loading…
Reference in New Issue