From patchwork Sun Feb 23 13:27:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 183758 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4245615ile; Sun, 23 Feb 2020 05:35:50 -0800 (PST) X-Google-Smtp-Source: APXvYqwxGS1NdBR2mKnEUKr8cTSzIfxtYhSMV5TjfIVsnf9bnEI5g1QR16lVvbiyg5LSG/+dBB4K X-Received: by 2002:ac8:1205:: with SMTP id x5mr41703538qti.238.1582464950402; Sun, 23 Feb 2020 05:35:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582464950; cv=none; d=google.com; s=arc-20160816; b=spW9lRTkxGtmqlIQsB4/wRMhXpMLCPZMGTpD9D4pBAm/1DDiSXSAMxjOM6MeYA0uRS EOaBUYKR/4bQUwK7cj4wfoKl4lka3ohb+JVgjoJsQ13A3+iP68lzdA8TRkjzIQDzESRA Ndivl+NKHuWbiX+zPrjf6/nYjtDGN3PXKYHkNYgmtIAf0d+VDGtTwnSHqfZe1jWS2KKc Lc0ZwPzsiZfxhUGjyfAWWt3oi5+4bY2HunKq8V8lbnUdOrP9R60flgpJht6dQY06j4Mt /PzVThorLsynXPF0PjXlPOPgCTAX6M8LaDVxkKpV9Dty6yxrHNnyVEHBOGvCYoIMub4A Ks6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=kVcq0OCTZJakvn00T0OFcXzuGLptNW+7/z5A+72Ny9o=; b=GzXgsIOb1tsH4MP2AzNSGCFZ+e38Q6+pSWR3Fwu5K6qMXmzWmdVCinritiO1p2z7kR StuNDjappAny3OcdFG0DfJTGtdfKv3hAcaH5PGFaKGkhfjSxqQ5ft+GNju3+hlHHD9yK iZB5Ln/AAEx4ErZNrAMtx03YlkfHh3no3X5DzftB5r+/m2g9cuRL0weINdImiqiFGh6P +jDhwTUx7afJhUsZGAiD7Ebr47WDBrq7krKK0DG8IcD+Jtr152FSmSlJsRehIFiVplNt aKRWbtXcL+IOwU6A5PADEbgkpZiRe6WLmoU8a9Ez0rKNi8H14bhTQmDuXT+lNeBi651H rQUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w26si4135637qtv.74.2020.02.23.05.35.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 23 Feb 2020 05:35:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:53002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5rQD-0002eR-UU for patch@linaro.org; Sun, 23 Feb 2020 08:35:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41784) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5rIj-00009E-9r for qemu-devel@nongnu.org; Sun, 23 Feb 2020 08:28:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5rIh-0003wg-Ay for qemu-devel@nongnu.org; Sun, 23 Feb 2020 08:28:05 -0500 Received: from mail01.asahi-net.or.jp ([202.224.55.13]:33332) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j5rIh-0003vo-1a for qemu-devel@nongnu.org; Sun, 23 Feb 2020 08:28:03 -0500 Received: from h61-195-96-97.vps.ablenet.jp (h61-195-96-97.ablenetvps.ne.jp [61.195.96.97]) (Authenticated sender: PQ4Y-STU) by mail01.asahi-net.or.jp (Postfix) with ESMTPA id 58FB05130B; Sun, 23 Feb 2020 22:28:02 +0900 (JST) Received: from yo-satoh-debian.localdomain (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by h61-195-96-97.vps.ablenet.jp (Postfix) with ESMTPSA id 18F2E240093; Sun, 23 Feb 2020 22:28:02 +0900 (JST) From: Yoshinori Sato To: qemu-devel@nongnu.org Subject: [PATCH RESEND v31 18/22] hw/rx: Honor -accel qtest Date: Sun, 23 Feb 2020 22:27:45 +0900 Message-Id: <20200223132750.69480-19-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200223132750.69480-1-ysato@users.sourceforge.jp> References: <20200223132750.69480-1-ysato@users.sourceforge.jp> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.224.55.13 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com, Richard Henderson , Yoshinori Sato Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Issue an error if no kernel, no bios, and not qtest'ing. Fixes make check-qtest-rx: test/qom-test. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Yoshinori Sato Message-Id: <20190607091116.49044-16-ysato@users.sourceforge.jp> Tested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- We could squash this with the previous patch --- hw/rx/rx62n.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index bd4cd4b6ea..c488934f09 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -21,12 +21,14 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/rx/rx62n.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "sysemu/sysemu.h" +#include "sysemu/qtest.h" #include "cpu.h" /* @@ -191,8 +193,14 @@ static void rx62n_realize(DeviceState *dev, Error **errp) memory_region_init_rom(&s->c_flash, NULL, "codeflash", RX62N_CFLASH_SIZE, errp); memory_region_add_subregion(s->sysmem, RX62N_CFLASH_BASE, &s->c_flash); + if (!s->kernel) { - rom_add_file_fixed(bios_name, RX62N_CFLASH_BASE, 0); + if (bios_name) { + rom_add_file_fixed(bios_name, RX62N_CFLASH_BASE, 0); + } else if (!qtest_enabled()) { + error_report("No bios or kernel specified"); + exit(1); + } } /* Initialize CPU */