From patchwork Mon Aug 5 13:27:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 264665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 76C602C0096 for ; Mon, 5 Aug 2013 23:32:25 +1000 (EST) Received: from localhost ([::1]:51866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6KtY-0004Yc-6y for incoming@patchwork.ozlabs.org; Mon, 05 Aug 2013 09:32:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6KpC-0005Sn-Mi for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:27:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6Kp0-0000Yv-JZ for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:27:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54401 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6Kp0-0000Ya-Bz for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:27:38 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DE5A6A554B; Mon, 5 Aug 2013 15:27:37 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 5 Aug 2013 15:27:09 +0200 Message-Id: <1375709247-10002-4-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1375709247-10002-1-git-send-email-afaerber@suse.de> References: <1375709247-10002-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH for-1.6? v2 03/21] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Replacing the assert() with more user-friendly error handling is left for a follow-up. Signed-off-by: Andreas Färber --- hw/unicore32/puv3.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 5ff0dc9..0d84cd9 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 */