mirror of https://github.com/proxmox/mirror_qemu
axis_dev88: Don't enforce use of kernel for qtest
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> Signed-off-by: Andreas Färber <afaerber@suse.de>master
parent
5633b90ad4
commit
5efe843a9a
|
@ -32,6 +32,7 @@
|
||||||
#include "boot.h"
|
#include "boot.h"
|
||||||
#include "sysemu/blockdev.h"
|
#include "sysemu/blockdev.h"
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
|
#include "sysemu/qtest.h"
|
||||||
|
|
||||||
#define D(x)
|
#define D(x)
|
||||||
#define DNAND(x)
|
#define DNAND(x)
|
||||||
|
@ -340,14 +341,14 @@ void axisdev88_init(QEMUMachineInitArgs *args)
|
||||||
irq[0x14 + i]);
|
irq[0x14 + i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!kernel_filename) {
|
if (kernel_filename) {
|
||||||
fprintf(stderr, "Kernel image must be specified\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
li.image_filename = kernel_filename;
|
li.image_filename = kernel_filename;
|
||||||
li.cmdline = kernel_cmdline;
|
li.cmdline = kernel_cmdline;
|
||||||
cris_load_image(cpu, &li);
|
cris_load_image(cpu, &li);
|
||||||
|
} else if (!qtest_enabled()) {
|
||||||
|
fprintf(stderr, "Kernel image must be specified\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static QEMUMachine axisdev88_machine = {
|
static QEMUMachine axisdev88_machine = {
|
||||||
|
|
Loading…
Reference in New Issue