diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-07-22 15:54:28 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-25 08:12:27 -0500 |
| commit | b332d24a8e1290954029814d09156b06ede358e2 (patch) | |
| tree | ecba8cdfc23c9b3dfc808fa44722e8c11b6feb01 | |
| parent | 504054357b7e491e0bc354ee5c8061071e51fc61 (diff) | |
| download | focaccia-qemu-b332d24a8e1290954029814d09156b06ede358e2.tar.gz focaccia-qemu-b332d24a8e1290954029814d09156b06ede358e2.zip | |
mips: degrade BIOS error to warning
No free MIPS BIOS is available, so it makes little sense to quit. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Message-id: 1374501278-31549-19-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/mips/mips_fulong2e.c | 3 | ||||
| -rw-r--r-- | hw/mips/mips_jazz.c | 3 | ||||
| -rw-r--r-- | hw/mips/mips_malta.c | 3 | ||||
| -rw-r--r-- | 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 9e305d2878..a7e9dcf4bf 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 2c4acb9ec4..d6e0860a83 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 de87241e9c..dad58c0ed2 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 e4a11c8a05..e8802c128e 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; |