From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Loeui-0001dq-Nj for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:26:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Loeui-0001dT-28 for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:26:04 -0400 Received: from [199.232.76.173] (port=33228 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Loeuh-0001dO-TN for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:26:03 -0400 Received: from qw-out-1920.google.com ([74.125.92.145]:54282) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Loeuh-0004rn-IS for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:26:03 -0400 Received: by qw-out-1920.google.com with SMTP id 5so1644130qwf.4 for ; Tue, 31 Mar 2009 07:26:02 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 31 Mar 2009 10:26:01 -0400 Message-ID: From: Leandro Dorileo Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/3] cleanup: bios_error in pc_init1() 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 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 176730e..7539a4f 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -847,9 +847,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_s= ize, bios_offset =3D qemu_ram_alloc(bios_size); ret =3D load_image(buf, phys_ram_base + bios_offset); if (ret !=3D bios_size) { - bios_error: - fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", buf); - exit(1); + goto bios_error; } if (cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled) { @@ -1108,6 +1106,10 @@ vga_bios_error: virtio_console_init(pci_bus, virtcon_hds[i]); } } + +bios_error: + fprintf(stderr, "qemu: could not load PC 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.