| Message ID | 20230125085407.7144-8-vikram.garhwal@amd.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce xenpvh machine for arm architecture | expand |
On Wed, 25 Jan 2023, Vikram Garhwal wrote: > Replace g_malloc with g_new and perror with error_setg_errno. > > Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com> > --- > hw/xen/xen-hvm-common.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c > index 94dbbe97ed..01c8ec1956 100644 > --- a/hw/xen/xen-hvm-common.c > +++ b/hw/xen/xen-hvm-common.c > @@ -34,7 +34,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, > trace_xen_ram_alloc(ram_addr, size); > > nr_pfn = size >> TARGET_PAGE_BITS; > - pfn_list = g_malloc(sizeof (*pfn_list) * nr_pfn); > + pfn_list = g_new(xen_pfn_t, nr_pfn); > > for (i = 0; i < nr_pfn; i++) { > pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; > @@ -726,7 +726,7 @@ void destroy_hvm_domain(bool reboot) > return; > } > if (errno != ENOTTY /* old Xen */) { > - perror("xendevicemodel_shutdown failed"); > + error_report("xendevicemodel_shutdown failed with error %d", errno); You can use strerror(errno), here and below. Either way: Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > } > /* well, try the old thing then */ > } > @@ -797,7 +797,7 @@ static void xen_do_ioreq_register(XenIOState *state, > } > > /* Note: cpus is empty at this point in init */ > - state->cpu_by_vcpu_id = g_malloc0(max_cpus * sizeof(CPUState *)); > + state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus); > > rc = xen_set_ioreq_server_state(xen_domid, state->ioservid, true); > if (rc < 0) { > @@ -806,7 +806,7 @@ static void xen_do_ioreq_register(XenIOState *state, > goto err; > } > > - state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); > + state->ioreq_local_port = g_new0(evtchn_port_t, max_cpus); > > /* FIXME: how about if we overflow the page here? */ > for (i = 0; i < max_cpus; i++) { > @@ -860,13 +860,13 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, > > state->xce_handle = xenevtchn_open(NULL, 0); > if (state->xce_handle == NULL) { > - perror("xen: event channel open"); > + error_report("xen: event channel open failed with error %d", errno); > goto err; > } > > state->xenstore = xs_daemon_open(); > if (state->xenstore == NULL) { > - perror("xen: xenstore open"); > + error_report("xen: xenstore open failed with error %d", errno); > goto err; > } > > -- > 2.17.0 > >
Il giorno mer 25 gen 2023 alle ore 22:07 Stefano Stabellini <sstabellini@kernel.org> ha scritto: > > On Wed, 25 Jan 2023, Vikram Garhwal wrote: > > Replace g_malloc with g_new and perror with error_setg_errno. > > error_setg_errno -> error_report ? Also in the title > > Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com> Frediano
diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 94dbbe97ed..01c8ec1956 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -34,7 +34,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, trace_xen_ram_alloc(ram_addr, size); nr_pfn = size >> TARGET_PAGE_BITS; - pfn_list = g_malloc(sizeof (*pfn_list) * nr_pfn); + pfn_list = g_new(xen_pfn_t, nr_pfn); for (i = 0; i < nr_pfn; i++) { pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i; @@ -726,7 +726,7 @@ void destroy_hvm_domain(bool reboot) return; } if (errno != ENOTTY /* old Xen */) { - perror("xendevicemodel_shutdown failed"); + error_report("xendevicemodel_shutdown failed with error %d", errno); } /* well, try the old thing then */ } @@ -797,7 +797,7 @@ static void xen_do_ioreq_register(XenIOState *state, } /* Note: cpus is empty at this point in init */ - state->cpu_by_vcpu_id = g_malloc0(max_cpus * sizeof(CPUState *)); + state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus); rc = xen_set_ioreq_server_state(xen_domid, state->ioservid, true); if (rc < 0) { @@ -806,7 +806,7 @@ static void xen_do_ioreq_register(XenIOState *state, goto err; } - state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); + state->ioreq_local_port = g_new0(evtchn_port_t, max_cpus); /* FIXME: how about if we overflow the page here? */ for (i = 0; i < max_cpus; i++) { @@ -860,13 +860,13 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, state->xce_handle = xenevtchn_open(NULL, 0); if (state->xce_handle == NULL) { - perror("xen: event channel open"); + error_report("xen: event channel open failed with error %d", errno); goto err; } state->xenstore = xs_daemon_open(); if (state->xenstore == NULL) { - perror("xen: xenstore open"); + error_report("xen: xenstore open failed with error %d", errno); goto err; }
Replace g_malloc with g_new and perror with error_setg_errno. Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com> --- hw/xen/xen-hvm-common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)