From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LoewK-0002Ck-FA for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:27:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LoewJ-0002CQ-Oj for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:27:44 -0400 Received: from [199.232.76.173] (port=33282 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LoewJ-0002CN-Ix for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:27:43 -0400 Received: from yw-out-1718.google.com ([74.125.46.154]:38380) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LoewJ-000564-9K for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:27:43 -0400 Received: by yw-out-1718.google.com with SMTP id 9so1504453ywk.82 for ; Tue, 31 Mar 2009 07:27:42 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 31 Mar 2009 10:27:42 -0400 Message-ID: Subject: [Qemu-devel] [PATCH 2/3] cleanup: vga_bios_error in pc_init1() From: Leandro Dorileo Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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_s= ize, ret =3D load_image(buf, phys_ram_base + vga_bios_offset); if (ret !=3D 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, --=20 1.6.2.1 --=20 (=B0=3D Leandro Dorileo //\ ldorileo@gmail.com - http://www.dorilex.net V_/ Software is a matter of freedom.