From patchwork Wed Feb 12 13:03:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 183311 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp6544958ile; Wed, 12 Feb 2020 05:06:06 -0800 (PST) X-Google-Smtp-Source: APXvYqyF6BbCj8lM3Cz+82fu+BUbE6kS1W454YnQ2ZpIYQ36+F4ZoCPUP3n5Funvtpfw4TxzKe+y X-Received: by 2002:a05:620a:986:: with SMTP id x6mr10698754qkx.328.1581512766470; Wed, 12 Feb 2020 05:06:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581512766; cv=none; d=google.com; s=arc-20160816; b=bt2fGLtI1cd3IeFMgWj1NSImX1MgV/t5RJtmDZVoSZS3LZrKPjZbd1SUQVXtA5r6d8 7NCz5At4yVEIHJ/uHF01m165+CSGdiQ7kkUBK3C3yTBk8uV2PM+TQFXFvu9gS8DHwws8 EDhlSKVKxAu01z+7IOpIyi5eS3XCRGtc75ydF733sT3Az3KUmFVo5iL5G9GiV1E/f8BQ O0TMmw+DSgHIySarZVB/LguZuiP545aJsqejUFB6huVM243d4sHkafBg2/2yNxodFI/u wzWzUkDOJQQxZmVXkLocX7or9bYk22z/iGcT16VKK8Y1wmYrSmpHMqEVJEK1J4gNpqat ouhw== 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=Li1IVOIvR9HmwmXQm6h28SX89SPijGg/vKzHtisKjLcp6Ukubbw7xzAUqd3xNpAS2q 4L9oM6c0QGvNPNf5otTb+I3HZ6A1dW9+vHyUquR5ZlNCBP7V+FACQ+kbXL81Md+V8Pab 11L2ZnLhlEYR0VW9s1MOwW1ASylnO/6/IrL+69l9D/XpAnyAORNegdq+3FvNDdXquTvf bprhPedoq1JIPT3A4+mVLcSPc9o0rXbsXOMveecq6bOcVwpedMOT/U0V+8iL0tW/OHCb 5EpLyridiJ0KhoA19n+dSsbSjgUJrsLt6Nju6R1EKp2piF/B5AR7IhX2l2+tITWZZRil 0lvA== 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 c19si74173qtn.378.2020.02.12.05.06.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Feb 2020 05:06:06 -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]:37386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1riP-0008AG-Ui for patch@linaro.org; Wed, 12 Feb 2020 08:06:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33340) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1rgD-0004an-O9 for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:03:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1rfp-00088Q-UE for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:03:49 -0500 Received: from mail02.asahi-net.or.jp ([202.224.55.14]:32937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j1rfo-00085D-ID for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:03:25 -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 mail02.asahi-net.or.jp (Postfix) with ESMTPA id 68F22DD661; Wed, 12 Feb 2020 22:03:23 +0900 (JST) Received: from yo-satoh-debian.localdomain (ae231051.dynamic.ppp.asahi-net.or.jp [14.3.231.51]) by h61-195-96-97.vps.ablenet.jp (Postfix) with ESMTPSA id 3B6B824008E; Wed, 12 Feb 2020 22:03:23 +0900 (JST) From: Yoshinori Sato To: qemu-devel@nongnu.org Subject: [PATCH v30 18/22] hw/rx: Honor -accel qtest Date: Wed, 12 Feb 2020 22:03:07 +0900 Message-Id: <20200212130311.127515-19-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200212130311.127515-1-ysato@users.sourceforge.jp> References: <20200212130311.127515-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.14 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 */