[Qemu-devel] [PATCH 2/3] cleanup: vga_bios_error in pc_init1()

[Qemu-devel] [PATCH 2/3] cleanup: vga_bios_error in pc_init1()

[Leandro Dorileo]

Moved vga_bios_error to the end of pc_init1() function, making the
code a bit more readable.

---
 hw/pc.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 7539a4f..f4cdcb5 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -864,9 +864,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,

         ret = load_image(buf, phys_ram_base + vga_bios_offset);
         if (ret != vga_bios_size) {
-vga_bios_error:
-            fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf);
-            exit(1);
+            goto vga_bios_error;
         }

         /* setup basic memory access */
@@ -1110,6 +1108,10 @@ vga_bios_error:
 bios_error:
     fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", buf);
     exit(1);
+
+vga_bios_error:
+    fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf);
+    exit(1);
 }

 static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,
-- 
1.6.2.1


-- 
(°=   Leandro Dorileo
//\    ldorileo@gmail.com   -   http://www.dorilex.net
V_/  Software is a matter of freedom.