From patchwork Mon Feb 24 14:19:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 183771 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp455198ile; Mon, 24 Feb 2020 06:25:29 -0800 (PST) X-Google-Smtp-Source: APXvYqzHuhRLy3EiaFSWiEn8YaCgtPz1Lfhr+cmuFdGNo2gX9HxCyMq5kH0WNCY574T3ZLXW41aP X-Received: by 2002:ae9:e40e:: with SMTP id q14mr14979405qkc.419.1582554329548; Mon, 24 Feb 2020 06:25:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582554329; cv=none; d=google.com; s=arc-20160816; b=HOsLD0JgPo6x2OLmjQ5WkbuJRk2emr6x2nDBjOkqXN01JexkWQHDprozppKYtw3E/2 Q+bcX1qSGpQh/rhibt/Xi5LJi/AiX0Um7WCiQo0EdEwmfMwpUgVkOJlPeX2JtNttxAwt P1dTsT73oemCcT8EznjvPoBEecoHPXDafKgS5dHxU4TAxkqRob6p+qgT1fk17ypgYkmP qnKDYDemBZ8vJv3PQpe8RuVWjqXxN4p155G58k5/KOQUTNumRC8Qx499kNtxAJZSqjwv lO6DEragrfbgV1Up2KnksAT5UCewlpGpiBWZSQTjHNhVDR1ZopotyyQZ0fgd2waM8DWi uRXw== 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=swGy2HDq6ZjgoCidmagxUt/unpPGbrX621P1h2myp+8t275G/s8+lwV2iGeTilbGE+ NrK+I+i2c219cXb3ld2MQ5KTMOxf+V3Pfb4yh7muOkeXG6gtwtM04Ib9FCBqcrrQ6l+I MtFXK+jyPfCI34FGwI6Or+VI0S9KVtV1Mkf0cKO3CNt5JE4Om6IJQMc17aw0tRB7mHT8 SqsiaRJcCArjxdD61oa+cGdmoxTAW8Cif/dBDLsW+tM1OeA6VgNPm0/TCozqZSvRFgvO G7dNUMvLmaTejlGYK00+qrj3h6UlVNTG39pnO5rK/z2E1MxZ+/F5xRcWM3/esEwUzhqx Ze7w== 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 c54si5935562qtk.335.2020.02.24.06.25.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Feb 2020 06:25:29 -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]:37100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Efo-00015V-0D for patch@linaro.org; Mon, 24 Feb 2020 09:25:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48392) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Ea8-0004L8-75 for qemu-devel@nongnu.org; Mon, 24 Feb 2020 09:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Ea6-0005sm-Lk for qemu-devel@nongnu.org; Mon, 24 Feb 2020 09:19:36 -0500 Received: from mail02.asahi-net.or.jp ([202.224.55.14]:55170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j6Ea6-0005rt-Ch for qemu-devel@nongnu.org; Mon, 24 Feb 2020 09:19:34 -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 A1A04E5543; Mon, 24 Feb 2020 23:19:33 +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 5800724008F; Mon, 24 Feb 2020 23:19:33 +0900 (JST) From: Yoshinori Sato To: qemu-devel@nongnu.org Subject: [PATCH v32 18/22] hw/rx: Honor -accel qtest Date: Mon, 24 Feb 2020 23:19:19 +0900 Message-Id: <20200224141923.82118-19-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200224141923.82118-1-ysato@users.sourceforge.jp> References: <20200224141923.82118-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 */