[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.6? 09/14] armv7m: Don't enforce use of kernel
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.6? 09/14] armv7m: Don't enforce use of kernel for qtest |
Date: |
Mon, 29 Jul 2013 19:15:36 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm/armv7m.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 5b22e84..06a9615 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -11,6 +11,7 @@
#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "elf.h"
+#include "sysemu/qtest.h"
/* Bitbanded IO. Each word corresponds to a single bit. */
@@ -227,21 +228,23 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
big_endian = 0;
#endif
- if (!kernel_filename) {
+ if (!kernel_filename && !qtest_enabled()) {
fprintf(stderr, "Guest image must be specified (using -kernel)\n");
exit(1);
}
- image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
- NULL, big_endian, ELF_MACHINE, 1);
- if (image_size < 0) {
- image_size = load_image_targphys(kernel_filename, 0, flash_size);
- lowaddr = 0;
- }
- if (image_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
- kernel_filename);
- exit(1);
+ if (kernel_filename) {
+ image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
+ NULL, big_endian, ELF_MACHINE, 1);
+ if (image_size < 0) {
+ image_size = load_image_targphys(kernel_filename, 0, flash_size);
+ lowaddr = 0;
+ }
+ if (image_size < 0) {
+ fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ kernel_filename);
+ exit(1);
+ }
}
/* Hack to map an additional page of ram at the top of the address
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.6? 00/14] qtest: Test all targets, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 01/14] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 07/14] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 10/14] axis_dev88: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 12/14] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 03/14] mainstone: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 05/14] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 06/14] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 09/14] armv7m: Don't enforce use of kernel for qtest,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.6? 13/14] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 04/14] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 14/14] qtest: Add dummy machine tests, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 11/14] puv3: Don't assert kernel filename for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 08/14] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/07/29