From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Guan Xuetao" <gxt@mprc.pku.edu.cn>, "Andreas Färber" <afaerber@suse.de>
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 [thread overview]
Message-ID: <1379943352-1979-4-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1379943352-1979-1-git-send-email-afaerber@suse.de>
Replacing the assert() with more user-friendly error handling is left
for a follow-up.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
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
next prev parent reply other threads:[~2013-09-23 13:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-23 13:35 [Qemu-devel] [PATCH v3 00/18] qtest: Test all targets Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 01/18] mips_mipssim: Silence BIOS loading warning for qtest Andreas Färber
2013-09-23 13:35 ` [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 14:51 ` Andreas Färber
2013-09-23 23:55 ` Peter Maydell
2013-09-30 13:58 ` Andreas Färber
2013-09-23 13:35 ` Andreas Färber [this message]
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 04/18] mainstone: Don't enforce use of -pflash for qtest Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 05/18] gumstix: " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 06/18] z2: " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 07/18] palm: Don't enforce loading ROM or kernel " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 08/18] omap_sx1: Don't enforce use of kernel or flash " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 09/18] exynos4_boards: Silence lack of -smp 2 warning " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 10/18] armv7m: Don't enforce use of kernel " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 11/18] axis_dev88: " Andreas Färber
2013-09-23 18:26 ` Edgar E. Iglesias
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 12/18] mcf5208: " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 13/18] an5206: " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 14/18] milkymist: Suppress -kernel/-bios/-drive error " Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 15/18] shix: Drop debug output Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 16/18] shix: Don't require firmware presence for qtest Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 17/18] leon3: Don't enforce use of -bios with qtest Andreas Färber
2013-09-23 13:35 ` [Qemu-devel] [PATCH v3 18/18] qtest: Prepare QOM machine tests Andreas Färber
2013-09-30 14:01 ` [Qemu-devel] [PATCH v3 00/18] qtest: Test all targets Andreas Färber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1379943352-1979-4-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=gxt@mprc.pku.edu.cn \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).