[Qemu-devel] [PATCH for 1.6] mips: revert commit b332d24a8e1290954029814d09156b06ede358e2

[Aurelien Jarno]

Now that this code path is not triggered anymore during the tests,
revert commit b332d24a8e1290954029814d09156b06ede358e2. Booting a MIPS
target without kernel nor bios doesn't really make sense.

Signed-off-by: Aurelien Jarno <address@hidden>
---
 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, 8 insertions(+), 4 deletions(-)

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index b13750d..f0b8d06 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -335,7 +335,8 @@ static void mips_fulong2e_init(QEMUMachineInitArgs *args)
 
         if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
             !kernel_filename && !qtest_enabled()) {
-            fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n", 
bios_name);
+            fprintf(stderr, "qemu: Could not load MIPS bios '%s'\n", 
bios_name);
+            exit(1);
         }
     }
 
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 36677cc..7ecb49a 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -178,8 +178,9 @@ static void mips_jazz_init(MemoryRegion *address_space,
         bios_size = -1;
     }
     if ((bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) && !qtest_enabled()) {
-        fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n",
+        fprintf(stderr, "qemu: 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 f56f34f..5726650 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1009,8 +1009,9 @@ void mips_malta_init(QEMUMachineInitArgs *args)
             if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
                 !kernel_filename && !qtest_enabled()) {
                 fprintf(stderr,
-                        "qemu: Warning, could not load MIPS bios '%s', and no 
-kernel argument was specified\n",
+                        "qemu: 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 fea1a15..f7ec179 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -192,8 +192,9 @@ 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: Warning, could not load MIPS bios '%s', and no -kernel 
argument was specified\n",
+                "qemu: 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.7.10.4