[Qemu-devel] [PATCH 1/5] spapr_pci: drop useless check in spapr_phb_vfio_get_loc_code()

Greg Kurz posted 5 patches 8 years, 1 month ago
[Qemu-devel] [PATCH 1/5] spapr_pci: drop useless check in spapr_phb_vfio_get_loc_code()
Posted by Greg Kurz 8 years, 1 month ago
g_strdup_printf() either returns a non-null pointer, either aborts
if it failed to allocate memory.

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

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index d7880f257aa1..ef982f2ef370 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -766,7 +766,7 @@ static char *spapr_phb_vfio_get_loc_code(sPAPRPHBState *sphb,  PCIDevice *pdev)
     /* Construct the path of the file that will give us the DT location */
     path = g_strdup_printf("/sys/bus/pci/devices/%s/devspec", host);
     g_free(host);
-    if (!path || !g_file_get_contents(path, &buf, NULL, NULL)) {
+    if (!g_file_get_contents(path, &buf, NULL, NULL)) {
         goto err_out;
     }
     g_free(path);
@@ -774,7 +774,7 @@ static char *spapr_phb_vfio_get_loc_code(sPAPRPHBState *sphb,  PCIDevice *pdev)
     /* Construct and read from host device tree the loc-code */
     path = g_strdup_printf("/proc/device-tree%s/ibm,loc-code", buf);
     g_free(buf);
-    if (!path || !g_file_get_contents(path, &buf, NULL, NULL)) {
+    if (!g_file_get_contents(path, &buf, NULL, NULL)) {
         goto err_out;
     }
     return buf;


Re: [Qemu-devel] [PATCH 1/5] spapr_pci: drop useless check in spapr_phb_vfio_get_loc_code()
Posted by Philippe Mathieu-Daudé 8 years, 1 month ago
On 09/09/2017 12:06 PM, Greg Kurz wrote:
> g_strdup_printf() either returns a non-null pointer, either aborts
> if it failed to allocate memory.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

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

> ---
>   hw/ppc/spapr_pci.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index d7880f257aa1..ef982f2ef370 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -766,7 +766,7 @@ static char *spapr_phb_vfio_get_loc_code(sPAPRPHBState *sphb,  PCIDevice *pdev)
>       /* Construct the path of the file that will give us the DT location */
>       path = g_strdup_printf("/sys/bus/pci/devices/%s/devspec", host);
>       g_free(host);
> -    if (!path || !g_file_get_contents(path, &buf, NULL, NULL)) {
> +    if (!g_file_get_contents(path, &buf, NULL, NULL)) {
>           goto err_out;
>       }
>       g_free(path);
> @@ -774,7 +774,7 @@ static char *spapr_phb_vfio_get_loc_code(sPAPRPHBState *sphb,  PCIDevice *pdev)
>       /* Construct and read from host device tree the loc-code */
>       path = g_strdup_printf("/proc/device-tree%s/ibm,loc-code", buf);
>       g_free(buf);
> -    if (!path || !g_file_get_contents(path, &buf, NULL, NULL)) {
> +    if (!g_file_get_contents(path, &buf, NULL, NULL)) {
>           goto err_out;
>       }
>       return buf;
> 
>