diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-10-06 20:49:21 -0300 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-20 13:32:10 +0200 |
| commit | 96f64aa8789451fc36396d848f397651fb999efb (patch) | |
| tree | 294f1687d9b99c51d6147eb0dcff31a20ba899b9 /target | |
| parent | e67277f8f32d56c64c7993163f41bb4338aec566 (diff) | |
S390: use g_new() family of functions
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: more changes in hw/s390x/css.c, added target/s390x/cpu_models.c]
Message-Id: <20171006235023.11952-27-f4bug@amsat.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/cpu_models.c | 12 | ||||
| -rw-r--r-- | target/s390x/diag.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 07ef8a3b6e..8c2d8851ae 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -392,7 +392,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque) /* strip off the -s390-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0; - info = g_malloc0(sizeof(*info)); + info = g_new0(CpuDefinitionInfo, 1); info->name = name; info->has_migration_safe = true; info->migration_safe = scc->is_migration_safe; @@ -412,7 +412,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque) object_unref(obj); } - entry = g_malloc0(sizeof(*entry)); + entry = g_new0(CpuDefinitionInfoList, 1); entry->value = info; entry->next = *cpu_list; *cpu_list = entry; @@ -574,7 +574,7 @@ CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionType type } /* convert it back to a static representation */ - expansion_info = g_malloc0(sizeof(*expansion_info)); + expansion_info = g_new0(CpuModelExpansionInfo, 1); expansion_info->model = g_malloc0(sizeof(*expansion_info->model)); cpu_info_from_model(expansion_info->model, &s390_model, delta_changes); return expansion_info; @@ -585,7 +585,7 @@ static void list_add_feat(const char *name, void *opaque) strList **last = (strList **) opaque; strList *entry; - entry = g_malloc0(sizeof(*entry)); + entry = g_new0(strList, 1); entry->value = g_strdup(name); entry->next = *last; *last = entry; @@ -609,7 +609,7 @@ CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *infoa, if (*errp) { return NULL; } - compare_info = g_malloc0(sizeof(*compare_info)); + compare_info = g_new0(CpuModelCompareInfo, 1); /* check the cpu generation and ga level */ if (modela.def->gen == modelb.def->gen) { @@ -713,7 +713,7 @@ CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *infoa, bitmap_and(model.features, model.features, model.def->full_feat, S390_FEAT_MAX); - baseline_info = g_malloc0(sizeof(*baseline_info)); + baseline_info = g_new0(CpuModelBaselineInfo, 1); baseline_info->model = g_malloc0(sizeof(*baseline_info->model)); cpu_info_from_model(baseline_info->model, &model, true); return baseline_info; diff --git a/target/s390x/diag.c b/target/s390x/diag.c index 82a623948d..dbbb9e886f 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -144,7 +144,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3) program_interrupt(env, PGM_ADDRESSING, ILEN_AUTO); return; } - iplb = g_malloc0(sizeof(IplParameterBlock)); + iplb = g_new0(IplParameterBlock, 1); cpu_physical_memory_read(addr, iplb, sizeof(iplb->len)); if (!iplb_valid_len(iplb)) { env->regs[r1 + 1] = DIAG_308_RC_INVALID; |