On 3/2/20 4:44 PM, Peter Maydell wrote:
On Thu, 27 Feb 2020 at 22:02, Niek Linnenbank <nieklinnenb...@gmail.com> wrote:
The Cubieboard machine does not support the -bios argument.
Report an error when -bios is used and exit immediately.
Signed-off-by: Niek Linnenbank <nieklinnenb...@gmail.com>
---
hw/arm/cubieboard.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 6c55d9056f..871b1beef4 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -19,6 +19,7 @@
#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "cpu.h"
+#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/arm/allwinner-a10.h"
@@ -33,6 +34,12 @@ static void cubieboard_init(MachineState *machine)
AwA10State *a10;
Error *err = NULL;
+ /* BIOS is not supported by this board */
+ if (bios_name) {
+ error_report("BIOS not supported for this machine");
+ exit(1);
+ }
We don't usually bother to check this, but I guess there's
no reason not to.
I agree this is confusing to expect the machine boot from a flash when
using -bios and having to debug until figuring out the reason.
This -bios is a generic machine option, maybe we could move this check
to the common machine code.
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
thanks
-- PMM