Skip to contentSkip to conversation

mips: revert commit b332d24a8e1290954029814d09156b06ede358e2

PATCH In review Aurelien Jarno 2 participants 3 messages Aug 6, 2013 – Aug 8, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mips: revert commit b332d24a8e1290954029814d09156b06ede358e2

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. At the same time replace fprintf(stderr, ...) by error_report().

---
 hw/mips/mips_fulong2e.c |    4 +++-
 hw/mips/mips_jazz.c     |    5 +++--
 hw/mips/mips_malta.c    |    7 ++++---
 hw/mips/mips_mipssim.c  |    7 ++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

v1 -> v2: replace fprintf(stderr, ...) by error_report()

hw/mips/mips_fulong2e.c +3 -1
index b13750d..b699100 100644
@@ -44,6 +44,7 @@
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "sysemu/qtest.h"
+#include "qemu/error-report.h"
 
 #define DEBUG_FULONG2E_INIT
 
@@ -335,7 +336,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);
+            error_report("Could not load MIPS bios '%s'\n", bios_name);
+            exit(1);
         }
     }
 
hw/mips/mips_jazz.c +3 -2
index 36677cc..d748ded 100644
@@ -43,6 +43,7 @@
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "sysemu/qtest.h"
+#include "qemu/error-report.h"
 
 enum jazz_model_e
 {
@@ -178,8 +179,8 @@ 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",
-                bios_name);
+        error_report("Could not load MIPS bios '%s'", bios_name);
+        exit(1);
     }
 
     /* Init CPU internal devices */
hw/mips/mips_malta.c +4 -3
index f56f34f..0f5de33 100644
@@ -49,6 +49,7 @@
 #include "hw/sysbus.h"             /* SysBusDevice */
 #include "qemu/host-utils.h"
 #include "sysemu/qtest.h"
+#include "qemu/error-report.h"
 
 //#define DEBUG_BOARD_INIT
 
@@ -1008,9 +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",
-                        bios_name);
+                error_report("Could not load MIPS bios '%s', and no "
+                             "-kernel argument was specified", bios_name);
+                exit(1);
             }
         }
         /* In little endian mode the 32bit words in the bios are swapped,
hw/mips/mips_mipssim.c +4 -3
index fea1a15..c10d1ad 100644
@@ -37,6 +37,7 @@
 #include "elf.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
+#include "qemu/error-report.h"
 
 static struct _loaderparams {
     int ram_size;
@@ -191,9 +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",
-                filename);
+        error_report("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;
Signature · 1 line
1.7.10.4
#1 lore raw

Am 06.08.2013 13:08, schrieb Aurelien Jarno:

Quoted 6 lines

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. At the same time replace fprintf(stderr, ...) by error_report().

Quoted 8 lines
---
 hw/mips/mips_fulong2e.c |    4 +++-
 hw/mips/mips_jazz.c     |    5 +++--
 hw/mips/mips_malta.c    |    7 ++++---
 hw/mips/mips_mipssim.c  |    7 ++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

v1 -> v2: replace fprintf(stderr, ...) by error_report()

If you drop the two remaining \n then feel free to commit with my Reviewed-by.

Thanks,
Andreas

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
#2 lore raw
Quoted 14 lines · Andreas Färber

Am 06.08.2013 13:08, schrieb Aurelien Jarno:

Quoted 13 lines

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. At the same time replace fprintf(stderr, ...) by error_report().

---
 hw/mips/mips_fulong2e.c |    4 +++-
 hw/mips/mips_jazz.c     |    5 +++--
 hw/mips/mips_malta.c    |    7 ++++---
 hw/mips/mips_mipssim.c  |    7 ++++---
 4 files changed, 14 insertions(+), 9 deletions(-)
Quoted 5 lines
Quoted 1 line

v1 -> v2: replace fprintf(stderr, ...) by error_report()

If you drop the two remaining \n then feel free to commit with my Reviewed-by.

Thanks for the review, I have just applied it with the mentioned changes.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net