[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] hw/arm/boot: Make user not specifying a kernel n
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 1/6] hw/arm/boot: Make user not specifying a kernel not an error |
Date: |
Fri, 25 Oct 2013 19:07:24 +0100 |
Typically ARM boards will have some kind of flash which might contain
a boot ROM; it's therefore a valid use case to provide only an
image for the boot ROM and not require QEMU's internal boot loader
at all. Remove the fatal error if -kernel isn't specified.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
---
hw/arm/boot.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 1e313af..583ec79 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -354,8 +354,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info
*info)
/* Load the kernel. */
if (!info->kernel_filename) {
- fprintf(stderr, "Kernel image must be specified\n");
- exit(1);
+ /* If no kernel specified, do nothing; we will start from address 0
+ * (typically a boot ROM image) in the same way as hardware.
+ */
+ return;
}
info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");
--
1.7.9.5
- [Qemu-devel] [PULL 0/6] target-arm queue, Peter Maydell, 2013/10/25
- [Qemu-devel] [PULL 5/6] target-arm: fix sorting issue of KVM cpreg list, Peter Maydell, 2013/10/25
- [Qemu-devel] [PULL 2/6] hw/arm: Tidy up conditional calls to arm_load_kernel, Peter Maydell, 2013/10/25
- [Qemu-devel] [PULL 4/6] target-arm: sort TCG cpreg list by KVM-style 64 bit ID number, Peter Maydell, 2013/10/25
- [Qemu-devel] [PULL 1/6] hw/arm/boot: Make user not specifying a kernel not an error,
Peter Maydell <=
- [Qemu-devel] [PULL 6/6] integrator: fix Linux boot failure by emulating dbg region, Peter Maydell, 2013/10/25
- [Qemu-devel] [PULL 3/6] target-arm: Add CP15 VBAR support, Peter Maydell, 2013/10/25
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Edgar E. Iglesias, 2013/10/31
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Andreas Färber, 2013/10/31
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Anthony Liguori, 2013/10/31
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Peter Maydell, 2013/10/31
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Andreas Färber, 2013/10/31
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Anthony Liguori, 2013/10/31
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Andreas Färber, 2013/10/31
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Anthony Liguori, 2013/10/31