From: Marc-André Lureau
Signed-off-by: Marc-André Lureau
Signed-off-by: Philippe Mathieu-Daudé
[PMD: more changes in hw/s390x/css.c, added target/s390x/cpu_models.c]
---
hw/s390x/css.c| 10 +-
hw/s390x/s390-pci-bus.c | 4 ++--
target/s390x/cpu_models.c | 12 ++--
target/s390x/diag.c | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 35683d7954..b6d4fcaf06 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -488,7 +488,7 @@ int css_create_css_image(uint8_t cssid, bool default_image)
if (channel_subsys.css[cssid]) {
return -EBUSY;
}
-channel_subsys.css[cssid] = g_malloc0(sizeof(CssImage));
+channel_subsys.css[cssid] = g_new0(CssImage, 1);
if (default_image) {
channel_subsys.default_cssid = cssid;
}
@@ -1778,7 +1778,7 @@ void css_undo_stcrw(CRW *crw)
{
CrwContainer *crw_cont;
-crw_cont = g_try_malloc0(sizeof(CrwContainer));
+crw_cont = g_try_new0(CrwContainer, 1);
if (!crw_cont) {
channel_subsys.crws_lost = true;
return;
@@ -2185,7 +2185,7 @@ void css_subch_assign(uint8_t cssid, uint8_t ssid,
uint16_t schid,
css = channel_subsys.css[cssid];
if (!css->sch_set[ssid]) {
-css->sch_set[ssid] = g_malloc0(sizeof(SubchSet));
+css->sch_set[ssid] = g_new0(SubchSet, 1);
}
s_set = css->sch_set[ssid];
@@ -2206,7 +2206,7 @@ void css_queue_crw(uint8_t rsc, uint8_t erc, int
solicited,
trace_css_crw(rsc, erc, rsid, chain ? "(chained)" : "");
/* TODO: Maybe use a static crw pool? */
-crw_cont = g_try_malloc0(sizeof(CrwContainer));
+crw_cont = g_try_new0(CrwContainer, 1);
if (!crw_cont) {
channel_subsys.crws_lost = true;
return;
@@ -2498,7 +2498,7 @@ SubchDev *css_create_sch(CssDevId bus_id, bool
is_virtual, bool squash_mcss,
}
}
-sch = g_malloc0(sizeof(*sch));
+sch = g_new0(SubchDev, 1);
sch->cssid = bus_id.cssid;
sch->ssid = bus_id.ssid;
sch->devno = bus_id.devid;
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 96116b7d1e..e7a58e81f7 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -240,7 +240,7 @@ static void s390_pci_generate_event(uint8_t cc, uint16_t
pec, uint32_t fh,
SeiContainer *sei_cont;
S390pciState *s = s390_get_phb();
-sei_cont = g_malloc0(sizeof(SeiContainer));
+sei_cont = g_new0(SeiContainer, 1);
sei_cont->fh = fh;
sei_cont->fid = fid;
sei_cont->cc = cc;
@@ -416,7 +416,7 @@ static S390PCIIOMMU *s390_pci_get_iommu(S390pciState *s,
PCIBus *bus,
S390PCIIOMMU *iommu;
if (!table) {
-table = g_malloc0(sizeof(S390PCIIOMMUTable));
+table = g_new0(S390PCIIOMMUTable, 1);
table->key = key;
g_hash_table_insert(s->iommu_table, >key, table);
}
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, _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