1. Patchew
  2. QEMU
  3. [PATCH v6 00/19] Misc ppc/mac machines clean up
  4. View patch

[PATCH v6 13/19] mac_{old|new}world: Code style fix adding missing braces to if-s

BALATON Zoltan posted 19 patches 3 years, 3 months ago
Maintainers: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, John Snow <jsnow@redhat.com>
There is a newer version of this series
[PATCH v6 13/19] mac_{old|new}world: Code style fix adding missing braces to if-s
Posted by BALATON Zoltan 3 years, 3 months ago 
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 hw/ppc/mac_newworld.c | 6 ++++--
 hw/ppc/mac_oldworld.c | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 6b2d781dea..37123daa6b 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -202,14 +202,16 @@ static void ppc_core99_init(MachineState *machine)
         kernel_size = load_elf(machine->kernel_filename, NULL,
                                translate_kernel_address, NULL, NULL, NULL,
                                NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
-        if (kernel_size < 0)
+        if (kernel_size < 0) {
             kernel_size = load_aout(machine->kernel_filename, kernel_base,
                                     machine->ram_size - kernel_base,
                                     bswap_needed, TARGET_PAGE_SIZE);
-        if (kernel_size < 0)
+        }
+        if (kernel_size < 0) {
             kernel_size = load_image_targphys(machine->kernel_filename,
                                               kernel_base,
                                               machine->ram_size - kernel_base);
+        }
         if (kernel_size < 0) {
             error_report("could not load kernel '%s'",
                          machine->kernel_filename);
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 23d9268281..558c639202 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -160,14 +160,16 @@ static void ppc_heathrow_init(MachineState *machine)
         kernel_size = load_elf(machine->kernel_filename, NULL,
                                translate_kernel_address, NULL, NULL, NULL,
                                NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
-        if (kernel_size < 0)
+        if (kernel_size < 0) {
             kernel_size = load_aout(machine->kernel_filename, kernel_base,
                                     machine->ram_size - kernel_base,
                                     bswap_needed, TARGET_PAGE_SIZE);
-        if (kernel_size < 0)
+        }
+        if (kernel_size < 0) {
             kernel_size = load_image_targphys(machine->kernel_filename,
                                               kernel_base,
                                               machine->ram_size - kernel_base);
+        }
         if (kernel_size < 0) {
             error_report("could not load kernel '%s'",
                          machine->kernel_filename);
@@ -291,8 +293,9 @@ static void ppc_heathrow_init(MachineState *machine)
         pci_create_simple(pci_bus, -1, "pci-ohci");
     }
 
-    if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
+    if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8) {
         graphic_depth = 15;
+    }
 
     /* No PCI init: the BIOS will do it */
 
-- 
2.30.6
Re: [PATCH v6 13/19] mac_{old|new}world: Code style fix adding missing braces to if-s
Posted by Mark Cave-Ayland 3 years, 3 months ago 
On 28/10/2022 12:56, BALATON Zoltan wrote:

> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
>   hw/ppc/mac_newworld.c | 6 ++++--
>   hw/ppc/mac_oldworld.c | 9 ++++++---
>   2 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 6b2d781dea..37123daa6b 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -202,14 +202,16 @@ static void ppc_core99_init(MachineState *machine)
>           kernel_size = load_elf(machine->kernel_filename, NULL,
>                                  translate_kernel_address, NULL, NULL, NULL,
>                                  NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
> -        if (kernel_size < 0)
> +        if (kernel_size < 0) {
>               kernel_size = load_aout(machine->kernel_filename, kernel_base,
>                                       machine->ram_size - kernel_base,
>                                       bswap_needed, TARGET_PAGE_SIZE);
> -        if (kernel_size < 0)
> +        }
> +        if (kernel_size < 0) {
>               kernel_size = load_image_targphys(machine->kernel_filename,
>                                                 kernel_base,
>                                                 machine->ram_size - kernel_base);
> +        }
>           if (kernel_size < 0) {
>               error_report("could not load kernel '%s'",
>                            machine->kernel_filename);
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 23d9268281..558c639202 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -160,14 +160,16 @@ static void ppc_heathrow_init(MachineState *machine)
>           kernel_size = load_elf(machine->kernel_filename, NULL,
>                                  translate_kernel_address, NULL, NULL, NULL,
>                                  NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
> -        if (kernel_size < 0)
> +        if (kernel_size < 0) {
>               kernel_size = load_aout(machine->kernel_filename, kernel_base,
>                                       machine->ram_size - kernel_base,
>                                       bswap_needed, TARGET_PAGE_SIZE);
> -        if (kernel_size < 0)
> +        }
> +        if (kernel_size < 0) {
>               kernel_size = load_image_targphys(machine->kernel_filename,
>                                                 kernel_base,
>                                                 machine->ram_size - kernel_base);
> +        }
>           if (kernel_size < 0) {
>               error_report("could not load kernel '%s'",
>                            machine->kernel_filename);
> @@ -291,8 +293,9 @@ static void ppc_heathrow_init(MachineState *machine)
>           pci_create_simple(pci_bus, -1, "pci-ohci");
>       }
>   
> -    if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
> +    if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8) {
>           graphic_depth = 15;
> +    }
>   
>       /* No PCI init: the BIOS will do it */
>   

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


ATB,

Mark.

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.