From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Loi8h-0002xC-AN
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:52:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Loi8g-0002wq-KX
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:52:42 -0400
Received: from [199.232.76.173] (port=52411 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Loi8g-0002wl-Gr
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:52:42 -0400
Received: from qw-out-1920.google.com ([74.125.92.145]:21499)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <ldorileo@gmail.com>) id 1Loi8f-0003Ig-L2
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:52:42 -0400
Received: by qw-out-1920.google.com with SMTP id 5so1729707qwf.4
	for <qemu-devel@nongnu.org>; Tue, 31 Mar 2009 10:52:38 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <d68f80d90903310726s24d03ffbtf2ca0213549a91e3@mail.gmail.com>
References: <d68f80d90903310726s24d03ffbtf2ca0213549a91e3@mail.gmail.com>
Date: Tue, 31 Mar 2009 13:52:38 -0400
Message-ID: <d68f80d90903311052ua7522e3l9393a836f25fb3b@mail.gmail.com>
From: Leandro Dorileo <ldorileo@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] Re: [PATCH 1/3] cleanup: bios_error in pc_init1()
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Please ignore those patches, it was written based on
git://git.savannah.nongnu.org/qemu.git

Sorry.

On Tue, Mar 31, 2009 at 10:26 AM, Leandro Dorileo <ldorileo@gmail.com> wrot=
e:
> Moved bios_error to the end of pc_init1() function, making the code a
> bit more readable.
>
> ---
> =A0hw/pc.c | =A0 =A08 +++++---
> =A01 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=
_size,
> =A0 =A0 bios_offset =3D qemu_ram_alloc(bios_size);
> =A0 =A0 ret =3D load_image(buf, phys_ram_base + bios_offset);
> =A0 =A0 if (ret !=3D bios_size) {
> - =A0 =A0bios_error:
> - =A0 =A0 =A0 =A0fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", b=
uf);
> - =A0 =A0 =A0 =A0exit(1);
> + =A0 =A0 =A0 =A0goto bios_error;
> =A0 =A0 }
>
> =A0 =A0 if (cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled) {
> @@ -1108,6 +1106,10 @@ vga_bios_error:
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 virtio_console_init(pci_bus, virtcon_hds[=
i]);
> =A0 =A0 =A0 =A0 }
> =A0 =A0 }
> +
> +bios_error:
> + =A0 =A0fprintf(stderr, "qemu: could not load PC BIOS '%s'\n", buf);
> + =A0 =A0exit(1);
> =A0}
>
> =A0static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,
> --

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