From patchwork Tue Jun 18 14:11:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 167165 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4329934ilk; Tue, 18 Jun 2019 07:56:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqwPguRU3t9uGC6MtgTS2dlLiIHdmydIdINNiXRNVQsBHU6lB5NmEXUX3zz4FDxHmwNAIjKE X-Received: by 2002:a0c:86e8:: with SMTP id 37mr28391376qvg.77.1560869764845; Tue, 18 Jun 2019 07:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560869764; cv=none; d=google.com; s=arc-20160816; b=xWHCGZQPgw0zagVZF2tv6HZHxKthFqciH9v6z+J1JVASLxMEiNRNxSfnmv2g2prn+B kg6eYQCrq1/i8uBU8gfCGyWnjd+x19xf4GqHwFKphG0mChCRnckfd0tpC7E3C2WG8ou+ Gz8EVsiyM449E6kd+5QB7ZCOcavx14jyLQxxnD3zJlu1Wk1qBtCmfpG3OJ0VN9Mm/S1g 9FaMQidrQFCa0dvkDy4eZwmRvfGu0bwhQ3miRJ+k2drw43LNE5lFB59g584sHHiPiGwq kiyKWjtTMse3uJeIF3X0+xVfM98elEx9Z8JypBT5L5TYhHYA/9PBz1mXVXXs4YXArgJV 2sWg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=WTgAchzxuRanviydbtTayWihIIXZsydUrp9wH71Hxc4=; b=xyEK999mkc72D+assgTnsaAY/5B2V1u4VR2wXUtw/rr0YSxeAHvqR0MSmBnuIDVzHy 3XQJ8DQD+Ow5mjpeR2oTMZ9NvxaNmhFGbbI1Jodw5wUGx7dujdndG6U9bPhPMwb0NZI/ BK+cUqFoiDW6NTR32B5+U/HswdLGDEoB9uZ2dTWHsPxr5iYUfC62v4aVLTh80dqobzck Fs2r5RCuD1J+FutcTcBfbKdMlUnn/9NypO1ZLJmu34TMjxrWaz885kUcTsA20s9BYXLP iuUFiW3/NUOKFKn3FJA5sMEKMhbxyemzPQSOFKOGtEIsiwn+gkuYFlAJvhWz0hYmUSx6 FOuw== 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 l17si9885559qkk.57.2019.06.18.07.56.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jun 2019 07:56:04 -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]:58688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdFWm-0000AV-FN for patch@linaro.org; Tue, 18 Jun 2019 10:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60507) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdEqL-00035I-J6 for qemu-devel@nongnu.org; Tue, 18 Jun 2019 10:12:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdEqJ-0000B2-18 for qemu-devel@nongnu.org; Tue, 18 Jun 2019 10:12:13 -0400 Received: from mail03.asahi-net.or.jp ([202.224.55.15]:57053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hdEqI-0007rp-AZ for qemu-devel@nongnu.org; Tue, 18 Jun 2019 10:12:10 -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 C17C94A2E7; Tue, 18 Jun 2019 23:11:36 +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 290CA240085; Tue, 18 Jun 2019 23:11:36 +0900 (JST) From: Yoshinori Sato To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2019 23:11:10 +0900 Message-Id: <20190618141118.52955-32-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190618141118.52955-1-ysato@users.sourceforge.jp> References: <20190618141118.52955-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 Subject: [Qemu-devel] [PATCH v21 16/21] hw/rx: Honor -accel qtest 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: peter.maydell@linaro.org, imammedo@redhat.com, Richard Henderson , Yoshinori Sato , philmd@redhat.com 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 Signed-off-by: Yoshinori Sato --- hw/rx/rx62n.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index 74d2fd0ee3..05d82d0b8f 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -21,11 +21,13 @@ #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 "sysemu/sysemu.h" +#include "sysemu/qtest.h" #include "cpu.h" /* @@ -190,8 +192,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 */