From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1GaO-0006Nx-CI for qemu-devel@nongnu.org; Mon, 22 Jul 2013 09:55:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1GaM-00064I-B0 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 09:55:36 -0400 Received: from mail-ea0-x231.google.com ([2a00:1450:4013:c01::231]:55691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1GaL-00063u-P8 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 09:55:34 -0400 Received: by mail-ea0-f177.google.com with SMTP id j14so3795841eak.8 for ; Mon, 22 Jul 2013 06:55:33 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 22 Jul 2013 15:54:28 +0200 Message-Id: <1374501278-31549-19-git-send-email-pbonzini@redhat.com> In-Reply-To: <1374501278-31549-1-git-send-email-pbonzini@redhat.com> References: <1374501278-31549-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 18/28] mips: degrade BIOS error to warning List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, aik@ozlabs.ru, agraf@suse.de, hpoussin@reactos.org, jan.kiszka@siemens.com, aurelien@aurel32.net No free MIPS BIOS is available, so it makes little sense to quit. Signed-off-by: Paolo Bonzini --- hw/mips/mips_fulong2e.c | 3 +-- hw/mips/mips_jazz.c | 3 +-- hw/mips/mips_malta.c | 3 +-- hw/mips/mips_mipssim.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 9e305d2..a7e9dcf 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -333,8 +333,7 @@ static void mips_fulong2e_init(QEMUMachineInitArgs *args) } if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) { - fprintf(stderr, "qemu: Could not load MIPS bios '%s'\n", bios_name); - exit(1); + fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n", bios_name); } } diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 2c4acb9..d6e0860 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -177,9 +177,8 @@ static void mips_jazz_init(MemoryRegion *address_space, bios_size = -1; } if (bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) { - fprintf(stderr, "qemu: Could not load MIPS bios '%s'\n", + fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n", bios_name); - exit(1); } /* Init CPU internal devices */ diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index de87241..dad58c0 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -908,9 +908,8 @@ void mips_malta_init(QEMUMachineInitArgs *args) } if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) { fprintf(stderr, - "qemu: Could not load MIPS bios '%s', and no -kernel argument was specified\n", + "qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n", bios_name); - exit(1); } } /* In little endian mode the 32bit words in the bios are swapped, diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index e4a11c8..e8802c1 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -192,9 +192,8 @@ mips_mipssim_init(QEMUMachineInitArgs *args) if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) { /* Bail out if we have neither a kernel image nor boot vector code. */ fprintf(stderr, - "qemu: Could not load MIPS bios '%s', and no -kernel argument was specified\n", + "qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n", filename); - exit(1); } else { /* We have a boot vector start address. */ env->active_tc.PC = (target_long)(int32_t)0xbfc00000; -- 1.8.1.4