| Message ID | 160398562892.32380.15006707861753544263.stgit@bahia.lan |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] spapr: Drop dead code in spapr_reallocate_hpt() | expand |
On Thu, Oct 29, 2020 at 04:33:48PM +0100, Greg Kurz wrote: > Sometimes QEMU needs to allocate the HPT in userspace, namely with TCG > or PR KVM. This is performed with qemu_memalign() because of alignment > requirements. Like glib's allocators, its behaviour is to abort on OOM > instead of returning NULL. > > This could be changed to qemu_try_memalign(), but in the specific case > of spapr_reallocate_hpt(), the outcome would be to terminate QEMU anyway > since no HPT means no MMU for the guest. Drop the dead code instead. > > Signed-off-by: Greg Kurz <groug@kaod.org> Series applied to ppc-for-5.2. > --- > hw/ppc/spapr.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 227075103e9a..12a012d9dd09 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1522,12 +1522,6 @@ int spapr_reallocate_hpt(SpaprMachineState *spapr, int shift, Error **errp) > int i; > > spapr->htab = qemu_memalign(size, size); > - if (!spapr->htab) { > - error_setg_errno(errp, errno, > - "Could not allocate HPT of order %d", shift); > - return -ENOMEM; > - } > - > memset(spapr->htab, 0, size); > spapr->htab_shift = shift; > > > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 227075103e9a..12a012d9dd09 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1522,12 +1522,6 @@ int spapr_reallocate_hpt(SpaprMachineState *spapr, int shift, Error **errp) int i; spapr->htab = qemu_memalign(size, size); - if (!spapr->htab) { - error_setg_errno(errp, errno, - "Could not allocate HPT of order %d", shift); - return -ENOMEM; - } - memset(spapr->htab, 0, size); spapr->htab_shift = shift;
Sometimes QEMU needs to allocate the HPT in userspace, namely with TCG or PR KVM. This is performed with qemu_memalign() because of alignment requirements. Like glib's allocators, its behaviour is to abort on OOM instead of returning NULL. This could be changed to qemu_try_memalign(), but in the specific case of spapr_reallocate_hpt(), the outcome would be to terminate QEMU anyway since no HPT means no MMU for the guest. Drop the dead code instead. Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/ppc/spapr.c | 6 ------ 1 file changed, 6 deletions(-)