[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 11/18] axis_dev88: Don't enforce use of kerne
From: |
Edgar E. Iglesias |
Subject: |
Re: [Qemu-devel] [PATCH v3 11/18] axis_dev88: Don't enforce use of kernel for qtest |
Date: |
Mon, 23 Sep 2013 20:26:08 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Mon, Sep 23, 2013 at 03:35:45PM +0200, Andreas Färber wrote:
> Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
> ---
> hw/cris/axis_dev88.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
> index 03058d3..5524088 100644
> --- a/hw/cris/axis_dev88.c
> +++ b/hw/cris/axis_dev88.c
> @@ -32,6 +32,7 @@
> #include "boot.h"
> #include "sysemu/blockdev.h"
> #include "exec/address-spaces.h"
> +#include "sysemu/qtest.h"
>
> #define D(x)
> #define DNAND(x)
> @@ -340,14 +341,14 @@ void axisdev88_init(QEMUMachineInitArgs *args)
> irq[0x14 + i]);
> }
>
> - if (!kernel_filename) {
> + if (kernel_filename) {
> + li.image_filename = kernel_filename;
> + li.cmdline = kernel_cmdline;
> + cris_load_image(cpu, &li);
> + } else if (!qtest_enabled()) {
> fprintf(stderr, "Kernel image must be specified\n");
> exit(1);
> }
> -
> - li.image_filename = kernel_filename;
> - li.cmdline = kernel_cmdline;
> - cris_load_image(cpu, &li);
> }
>
> static QEMUMachine axisdev88_machine = {
> --
> 1.8.1.4
>
- [Qemu-devel] [PATCH v3 06/18] z2: Don't enforce use of -pflash for qtest, (continued)
- [Qemu-devel] [PATCH v3 06/18] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 16/18] shix: Don't require firmware presence for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 03/18] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 09/18] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 12/18] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 08/18] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 05/18] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 07/18] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 10/18] armv7m: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 11/18] axis_dev88: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- Re: [Qemu-devel] [PATCH v3 11/18] axis_dev88: Don't enforce use of kernel for qtest,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v3 15/18] shix: Drop debug output, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 13/18] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 01/18] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 04/18] mainstone: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 18/18] qtest: Prepare QOM machine tests, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 17/18] leon3: Don't enforce use of -bios with qtest, Andreas Färber, 2013/09/23
- Re: [Qemu-devel] [PATCH v3 00/18] qtest: Test all targets, Andreas Färber, 2013/09/30