Re: [Qemu-devel] [PATCH for-1.6? v2 14/21] milkymis t: Suppress -kernel/-bios/-drive error for qtest

[Michael Walle]

Am 2013-08-05 15:27, schrieb Andreas Färber:
> Signed-off-by: Andreas Färber <address@hidden>

Acked-by: Michael Walle <address@hidden>

> ---
>  hw/lm32/milkymist.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
> index 7ceedb8..a8e7230 100644
> --- a/hw/lm32/milkymist.c
> +++ b/hw/lm32/milkymist.c
> @@ -21,6 +21,7 @@
>  #include "hw/hw.h"
>  #include "hw/block/flash.h"
>  #include "sysemu/sysemu.h"
> +#include "sysemu/qtest.h"
>  #include "hw/devices.h"
>  #include "hw/boards.h"
>  #include "hw/loader.h"
> @@ -143,7 +144,7 @@ milkymist_init(QEMUMachineInitArgs *args)
>      reset_info->bootstrap_pc = BIOS_OFFSET;
>
>      /* if no kernel is given no valid bios rom is a fatal error */
> -    if (!kernel_filename && !dinfo && !bios_filename) {
> +    if (!kernel_filename && !dinfo && !bios_filename && 
> !qtest_enabled()) {
>          fprintf(stderr, "qemu: could not load Milkymist One bios 
> '%s'\n",
>                  bios_name);
>          exit(1);