xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 20:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

S390: use g_new() family of functions

Browse Source 
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>
This commit is contained in:
Marc-André Lureau 2017-10-06 20:49:21 -03:00 committed by Cornelia Huck
parent e67277f8f3
commit 96f64aa878
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/s390x/css.c
View File

@ -488,7 +488,7 @@ int css_create_css_image(uint8_t cssid, bool default_image)
if (channel_subsys.css[cssid]) { if (channel_subsys.css[cssid]) {
return -EBUSY; return -EBUSY;
} }
channel_subsys.css[cssid] = g_malloc0(sizeof(CssImage)); channel_subsys.css[cssid] = g_new0(CssImage, 1);
if (default_image) { if (default_image) {
channel_subsys.default_cssid = cssid; channel_subsys.default_cssid = cssid;
} }
@ -1778,7 +1778,7 @@ void css_undo_stcrw(CRW *crw)
{ {
CrwContainer *crw_cont; CrwContainer *crw_cont;
crw_cont = g_try_malloc0(sizeof(CrwContainer)); crw_cont = g_try_new0(CrwContainer, 1);
if (!crw_cont) { if (!crw_cont) {
channel_subsys.crws_lost = true; channel_subsys.crws_lost = true;
return; return;
@ -2185,7 +2185,7 @@ void css_subch_assign(uint8_t cssid, uint8_t ssid, uint16_t schid,
css = channel_subsys.css[cssid]; css = channel_subsys.css[cssid];
if (!css->sch_set[ssid]) { 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]; 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)" : ""); trace_css_crw(rsc, erc, rsid, chain ? "(chained)" : "");
/* TODO: Maybe use a static crw pool? */ /* TODO: Maybe use a static crw pool? */
crw_cont = g_try_malloc0(sizeof(CrwContainer)); crw_cont = g_try_new0(CrwContainer, 1);
if (!crw_cont) { if (!crw_cont) {
channel_subsys.crws_lost = true; channel_subsys.crws_lost = true;
return; 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->cssid = bus_id.cssid;
sch->ssid = bus_id.ssid; sch->ssid = bus_id.ssid;
sch->devno = bus_id.devid; sch->devno = bus_id.devid;

4
hw/s390x/s390-pci-bus.c
View File

@ -240,7 +240,7 @@ static void s390_pci_generate_event(uint8_t cc, uint16_t pec, uint32_t fh,
SeiContainer *sei_cont; SeiContainer *sei_cont;
S390pciState *s = s390_get_phb(); S390pciState *s = s390_get_phb();
sei_cont = g_malloc0(sizeof(SeiContainer)); sei_cont = g_new0(SeiContainer, 1);
sei_cont->fh = fh; sei_cont->fh = fh;
sei_cont->fid = fid; sei_cont->fid = fid;
sei_cont->cc = cc; sei_cont->cc = cc;
@ -416,7 +416,7 @@ static S390PCIIOMMU *s390_pci_get_iommu(S390pciState *s, PCIBus *bus,
S390PCIIOMMU *iommu; S390PCIIOMMU *iommu;
if (!table) { if (!table) {
table = g_malloc0(sizeof(S390PCIIOMMUTable)); table = g_new0(S390PCIIOMMUTable, 1);
table->key = key; table->key = key;
g_hash_table_insert(s->iommu_table, &table->key, table); g_hash_table_insert(s->iommu_table, &table->key, table);
} }

12
target/s390x/cpu_models.c
View File

@ -392,7 +392,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque)
/* strip off the -s390-cpu */ /* strip off the -s390-cpu */
g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0; g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0;
info = g_malloc0(sizeof(*info)); info = g_new0(CpuDefinitionInfo, 1);
info->name = name; info->name = name;
info->has_migration_safe = true; info->has_migration_safe = true;
info->migration_safe = scc->is_migration_safe; info->migration_safe = scc->is_migration_safe;
@ -412,7 +412,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque)
object_unref(obj); object_unref(obj);
} }
entry = g_malloc0(sizeof(*entry)); entry = g_new0(CpuDefinitionInfoList, 1);
entry->value = info; entry->value = info;
entry->next = *cpu_list; entry->next = *cpu_list;
*cpu_list = entry; *cpu_list = entry;
@ -574,7 +574,7 @@ CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionType type
} }
/* convert it back to a static representation */ /* 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)); expansion_info->model = g_malloc0(sizeof(*expansion_info->model));
cpu_info_from_model(expansion_info->model, &s390_model, delta_changes); cpu_info_from_model(expansion_info->model, &s390_model, delta_changes);
return expansion_info; return expansion_info;
@ -585,7 +585,7 @@ static void list_add_feat(const char *name, void *opaque)
strList **last = (strList **) opaque; strList **last = (strList **) opaque;
strList *entry; strList *entry;
entry = g_malloc0(sizeof(*entry)); entry = g_new0(strList, 1);
entry->value = g_strdup(name); entry->value = g_strdup(name);
entry->next = *last; entry->next = *last;
*last = entry; *last = entry;
@ -609,7 +609,7 @@ CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *infoa,
if (*errp) { if (*errp) {
return NULL; return NULL;
} }
compare_info = g_malloc0(sizeof(*compare_info)); compare_info = g_new0(CpuModelCompareInfo, 1);
/* check the cpu generation and ga level */ /* check the cpu generation and ga level */
if (modela.def->gen == modelb.def->gen) { 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, bitmap_and(model.features, model.features, model.def->full_feat,
S390_FEAT_MAX); 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)); baseline_info->model = g_malloc0(sizeof(*baseline_info->model));
cpu_info_from_model(baseline_info->model, &model, true); cpu_info_from_model(baseline_info->model, &model, true);
return baseline_info; return baseline_info;

2
target/s390x/diag.c
View File

@ -144,7 +144,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3)
program_interrupt(env, PGM_ADDRESSING, ILEN_AUTO); program_interrupt(env, PGM_ADDRESSING, ILEN_AUTO);
return; return;
} }
iplb = g_malloc0(sizeof(IplParameterBlock)); iplb = g_new0(IplParameterBlock, 1);
cpu_physical_memory_read(addr, iplb, sizeof(iplb->len)); cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
if (!iplb_valid_len(iplb)) { if (!iplb_valid_len(iplb)) {
env->regs[r1 + 1] = DIAG_308_RC_INVALID; env->regs[r1 + 1] = DIAG_308_RC_INVALID;