spapr_phb_get_loc_code() either returns a non-null pointer, either
aborts if g_strdup_printf() failed to allocate memory.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/ppc/spapr_pci.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index ef982f2ef370..cd8efb181223 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1282,12 +1282,8 @@ static int spapr_populate_pci_child_dt(PCIDevice *dev, void *fdt, int offset,
                             pci_find_device_name((ccode >> 16) & 0xff,
                                                  (ccode >> 8) & 0xff,
                                                  ccode & 0xff)));
-    buf = spapr_phb_get_loc_code(sphb, dev);
-    if (!buf) {
-        error_report("Failed setting the ibm,loc-code");
-        return -1;
-    }
 
+    buf = spapr_phb_get_loc_code(sphb, dev);
     err = fdt_setprop_string(fdt, offset, "ibm,loc-code", buf);
     g_free(buf);
     if (err < 0) {

On 09/09/2017 12:06 PM, Greg Kurz wrote:
> spapr_phb_get_loc_code() either returns a non-null pointer, either
> aborts if g_strdup_printf() failed to allocate memory.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>   hw/ppc/spapr_pci.c |    6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index ef982f2ef370..cd8efb181223 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -1282,12 +1282,8 @@ static int spapr_populate_pci_child_dt(PCIDevice *dev, void *fdt, int offset,
>                               pci_find_device_name((ccode >> 16) & 0xff,
>                                                    (ccode >> 8) & 0xff,
>                                                    ccode & 0xff)));
> -    buf = spapr_phb_get_loc_code(sphb, dev);
> -    if (!buf) {
> -        error_report("Failed setting the ibm,loc-code");
> -        return -1;
> -    }
>   
> +    buf = spapr_phb_get_loc_code(sphb, dev);
>       err = fdt_setprop_string(fdt, offset, "ibm,loc-code", buf);
>       g_free(buf);
>       if (err < 0) {
> 
>