[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/18] puv3: Turn puv3_load_kernel() into a no-op
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v3 03/18] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel |
Date: |
Mon, 23 Sep 2013 15:35:37 +0200 |
Replacing the assert() with more user-friendly error handling is left
for a follow-up.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/unicore32/puv3.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index a900061..e05cbc1 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -17,6 +17,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/i386/pc.h"
+#include "sysemu/qtest.h"
#undef DEBUG_PUV3
#include "hw/unicore32/puv3.h"
@@ -84,6 +85,9 @@ static void puv3_load_kernel(const char *kernel_filename)
{
int size;
+ if (kernel_filename == NULL && qtest_enabled()) {
+ return;
+ }
assert(kernel_filename != NULL);
/* only zImage format supported */
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/18] qtest: Test all targets, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 14/18] milkymist: Suppress -kernel/-bios/-drive error for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 02/18] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel, Andreas Färber, 2013/09/23
- [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 <=
- [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
- [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