[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/58] armv7m: Don't enforce use of kernel for qtest
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 11/58] armv7m: Don't enforce use of kernel for qtest |
Date: |
Tue, 8 Oct 2013 19:44:09 +0200 |
Adopt error_report().
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 89a9015..397e8df 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -11,6 +11,8 @@
#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "elf.h"
+#include "sysemu/qtest.h"
+#include "qemu/error-report.h"
/* Bitbanded IO. Each word corresponds to a single bit. */
@@ -232,21 +234,22 @@ 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) {
+ error_report("Could not load kernel '%s'", kernel_filename);
+ exit(1);
+ }
}
/* Hack to map an additional page of ram at the top of the address
--
1.8.1.4
- [Qemu-devel] [PULL 57/58] ide: Drop ide_init2_with_non_qdev_drives(), (continued)
- [Qemu-devel] [PULL 57/58] ide: Drop ide_init2_with_non_qdev_drives(), Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 27/58] a9mpcore: Embed ARMMPTimerState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 18/58] leon3: Don't enforce use of -bios with qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 49/58] qdev-monitor: Avoid qdev as variable name, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 56/58] microdrive: Coding Style cleanups, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 37/58] arm11mpcore: Create container MemoryRegion in instance_init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 58/58] pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 19/58] qtest: Prepare QOM machine tests, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 50/58] qdev-monitor: Inline qdev_init() for device_add, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 48/58] qdev: Drop misleading qdev_free() function, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 11/58] armv7m: Don't enforce use of kernel for qtest,
Andreas Färber <=
- [Qemu-devel] [PULL 45/58] qdev-monitor: Clean up qdev_device_add() variable naming, Andreas Färber, 2013/10/08