From patchwork Mon Oct 14 11:57:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 176205 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4416032ill; Mon, 14 Oct 2019 05:02:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqzLoWpwE3k4M3hvkWZMJvsKJmmPwwiowfJWsLj/VKBmwJrFnQOynL6kHOFq+zWir/mdUTH5 X-Received: by 2002:ac8:3334:: with SMTP id t49mr32338011qta.170.1571054571067; Mon, 14 Oct 2019 05:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571054571; cv=none; d=google.com; s=arc-20160816; b=te7rLEIsBywb5g16woXEfGP9iJTq6hHxQLJE1D5bD4y9GAoONptVKrKfSNkmyT1S4/ sJM5ZkMhRqliXThQcErV8YIO10LHPV5qkIQ1N49nqFvEnNbjMgSpCHsH+VDXc24ZseKg QDALLizPXhz/czFCX92kQ0ZWUvJHxm8IjyBXMSkyRtP4ufG8hGu+gluZOFXCl6COFt5X CwUvvEOLDiQwgdru/pXHUTu97BkPba5eL1I6g2Y2Oo1B+BXBfM85TRjvfLg4ElQlgiG2 uK8E1T5cBpGuCxJWgTqEJKrmL46lNObEsnsiJilnKv2B22soLjy2e+Pc0PJdLzbBC9LQ eMvg== 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=aJJM0vtTHXXmtrVHVv2W28wyOU8ZxR/iN7ySpCdtVXQ=; b=bXho4uWQFAuRVJAw2pT1q2U/AID/Fwnw4K8R0sTzTa+JghdnqIuDQG+4JA0a1s1RcP EniqDWZz9GwGtz4IkmLtrWgn+Snw16ZyLOhA+uBF9TR1AedW380lMzxxWMkbhLhFsMyW qVLK1thGt9XPSOQ9qdt7ZVewhFZOBnjKkio4+QIMUVXOgnD+mKh1GCsSMYuaoU/XLimB QSD5QNsjg+O1VrRWGXf1h+MjtQLseCQ5M2i5hTMt7XAkzc4L9eSg99qnaicyL7P23sQ6 5Swi/RHQddoTzEKkLV2AHGvrgzmCuP/MQUE6tsxiQd3P+O5J9Rbbu3b7hH94VvuaHczV Myug== 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 p58si18160542qta.162.2019.10.14.05.02.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 05:02:51 -0700 (PDT) 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]:48346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJz3p-0000vX-Nn for patch@linaro.org; Mon, 14 Oct 2019 08:02:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53508) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJyzN-0005TN-He for qemu-devel@nongnu.org; Mon, 14 Oct 2019 07:58:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJyzL-0003az-JO for qemu-devel@nongnu.org; Mon, 14 Oct 2019 07:58:13 -0400 Received: from mail03.asahi-net.or.jp ([202.224.55.15]:35705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iJyzL-0003ZX-9a for qemu-devel@nongnu.org; Mon, 14 Oct 2019 07:58:11 -0400 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 mail03.asahi-net.or.jp (Postfix) with ESMTPA id 836D175D3B; Mon, 14 Oct 2019 20:58:10 +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 45D6824008E; Mon, 14 Oct 2019 20:58:10 +0900 (JST) From: Yoshinori Sato To: qemu-devel@nongnu.org Subject: [PATCH v26 18/21] hw/rx: Honor -accel qtest Date: Mon, 14 Oct 2019 20:57:54 +0900 Message-Id: <20191014115757.51866-19-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191014115757.51866-1-ysato@users.sourceforge.jp> References: <20191014115757.51866-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.15 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 ac47f2a397..a0986fd15e 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 */