From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LoexJ-0002YV-0C for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:28:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LoexE-0002WO-58 for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:28:44 -0400 Received: from [199.232.76.173] (port=33302 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LoexD-0002WD-So for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:28:39 -0400 Received: from mx20.gnu.org ([199.232.41.8]:29431) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LoexD-0005Dq-IN for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:28:39 -0400 Received: from mail-qy0-f111.google.com ([209.85.221.111]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LoexC-0008Ow-TI for qemu-devel@nongnu.org; Tue, 31 Mar 2009 10:28:39 -0400 Received: by qyk9 with SMTP id 9so4654213qyk.4 for ; Tue, 31 Mar 2009 07:28:36 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 31 Mar 2009 10:28:36 -0400 Message-ID: Subject: [Qemu-devel] [PATCH 3/3] cleanup: option_rom_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 option_rom_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 f4cdcb5..9cab2ba 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -906,9 +906,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_s= ize, option_rom_offset =3D qemu_ram_alloc(size); ret =3D load_image(option_rom[i], phys_ram_base + option_rom_o= ffset); if (ret !=3D size) { - option_rom_error: - fprintf(stderr, "Too many option ROMS\n"); - exit(1); + goto option_rom_error; } size =3D (size + 4095) & ~4095; cpu_register_physical_memory(0xd0000 + offset, @@ -1112,6 +1110,10 @@ bios_error: vga_bios_error: fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf); exit(1); + +option_rom_error: + fprintf(stderr, "Too many option ROMS\n"); + 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.