motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 20:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use glib memory allocation and free functions

Browse source 
qemu_malloc/qemu_free no longer exist after this commit.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2011-08-20 22:09:37 -05:00
parent 14015304b6
commit 7267c0947d
357 changed files with 1672 additions and 1674 deletions
Download patch file Download diff file Expand all files Collapse all files

28
qemu-option.c
View file

@ -277,7 +277,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name,
case OPT_STRING:
if (value != NULL) {
list->value.s = qemu_strdup(value);
list->value.s = g_strdup(value);
} else {
fprintf(stderr, "Option '%s' needs a parameter\n", name);
return -1;
@ -337,12 +337,12 @@ void free_option_parameters(QEMUOptionParameter *list)
while (cur && cur->name) {
if (cur->type == OPT_STRING) {
qemu_free(cur->value.s);
g_free(cur->value.s);
}
cur++;
}
qemu_free(list);
g_free(list);
}
/*
@ -377,7 +377,7 @@ QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest,
num_options += count_option_parameters(list);
dest = qemu_realloc(dest, (num_options + 1) * sizeof(QEMUOptionParameter));
dest = g_realloc(dest, (num_options + 1) * sizeof(QEMUOptionParameter));
dest[num_dest_options].name = NULL;
while (list && list->name) {
@ -594,9 +594,9 @@ static int qemu_opt_parse(QemuOpt *opt)
static void qemu_opt_del(QemuOpt *opt)
{
QTAILQ_REMOVE(&opt->opts->head, opt, next);
qemu_free((/* !const */ char*)opt->name);
qemu_free((/* !const */ char*)opt->str);
qemu_free(opt);
g_free((/* !const */ char*)opt->name);
g_free((/* !const */ char*)opt->str);
g_free(opt);
}
int qemu_opt_set(QemuOpts *opts, const char *name, const char *value)
@ -619,15 +619,15 @@ int qemu_opt_set(QemuOpts *opts, const char *name, const char *value)
}
}
opt = qemu_mallocz(sizeof(*opt));
opt->name = qemu_strdup(name);
opt = g_malloc0(sizeof(*opt));
opt->name = g_strdup(name);
opt->opts = opts;
QTAILQ_INSERT_TAIL(&opts->head, opt, next);
if (desc[i].name != NULL) {
opt->desc = desc+i;
}
if (value) {
opt->str = qemu_strdup(value);
opt->str = g_strdup(value);
}
if (qemu_opt_parse(opt) < 0) {
qemu_opt_del(opt);
@ -701,9 +701,9 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, int fail_if_exist
}
}
}
opts = qemu_mallocz(sizeof(*opts));
opts = g_malloc0(sizeof(*opts));
if (id) {
opts->id = qemu_strdup(id);
opts->id = g_strdup(id);
}
opts->list = list;
loc_save(&opts->loc);
@ -754,8 +754,8 @@ void qemu_opts_del(QemuOpts *opts)
qemu_opt_del(opt);
}
QTAILQ_REMOVE(&opts->list->head, opts, next);
qemu_free(opts->id);
qemu_free(opts);
g_free(opts->id);
g_free(opts);
}
int qemu_opts_print(QemuOpts *opts, void *dummy)