From patchwork Fri Sep 27 06:22:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yoshinori Sato X-Patchwork-Id: 174584 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3095848ill; Thu, 26 Sep 2019 23:53:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbz2EhkU1P9PgnYhR6SAIEG+WW4b5ZalqYrZG/DgOXBqkIwu8UREQKOvBy1YbgO0UOAEZm X-Received: by 2002:ac8:7648:: with SMTP id i8mr8507554qtr.363.1569567217330; Thu, 26 Sep 2019 23:53:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569567217; cv=none; d=google.com; s=arc-20160816; b=uvC3etG//l4PvSw8iXhBZT28dVXv7f2oQtSSqGaFFL7THN+DV8Fltd6CKmYig/3CAO 2SBFuv9VulpYwrd32wyAQG2MJsdTNkFxvc15XxlrsN5nBt8skIvBb3YNI5VXe8E1qLrF OGM5ghWmoOFZQMnaynvvwTkrBqIFmaTLzvgkrxHmrNRvmhJKCrGbr/eu8R1P/VDwl//n 3OjWw+MDUHTVo4hUj/jiJoCRD5vm1SwXrLVdQYofp87CaDEzA9+Err1u75hCZacuTfgp cJf19ufDnEZcKR+HESEus6Tw8j1eMN14Pi2/UvalL2ld/CxtOFpniG7llG+/tm8knFx4 ycHw== 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=O2HjnEqdXLkJQr5UO2E6wmvRfHl9nCThqtqUN2YwDMAgKeoWWavkVUQSA5tlPBizHU H81Z4w8aOeEqeAk+iS0yzmJ+rZqchLCbfy6xUIeQnOLSJuQjNu3HHBFL2C2xGHa0HDuL Gdf9bktP9lK9h8+M9/QCKPl7mSAzJmc+w0gvRLldPmLaoGpeI/vj0CC6mPOXu6zl25PO TuE5SlYep33T8sSiIN8VbsG2MAEKDMMbyYMM5LOP+uxjUcciD3jhiedJ//B9B0v/jQLo wjTyS2iUKqayUH089FvEjvqmw6nNzhZN7IMCk73iWuOR0mj/E2YiUPA3HloUn1L/sMIH GJaQ== 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 h20si4081337qvd.218.2019.09.26.23.53.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Sep 2019 23:53:37 -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]:47121 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDk8G-00035r-Ma for patch@linaro.org; Fri, 27 Sep 2019 02:53:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53735) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDjew-0007HW-GZ for qemu-devel@nongnu.org; Fri, 27 Sep 2019 02:23:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDjeu-0004HH-8F for qemu-devel@nongnu.org; Fri, 27 Sep 2019 02:23:18 -0400 Received: from mail02.asahi-net.or.jp ([202.224.55.14]:59398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iDjet-0004CU-Q1 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 02:23:16 -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 mail02.asahi-net.or.jp (Postfix) with ESMTPA id 282C86CC71; Fri, 27 Sep 2019 15:23:15 +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 D202F240086; Fri, 27 Sep 2019 15:23:14 +0900 (JST) From: Yoshinori Sato To: qemu-devel@nongnu.org Subject: [PATCH v25 18/22] hw/rx: Honor -accel qtest Date: Fri, 27 Sep 2019 15:22:58 +0900 Message-Id: <20190927062302.110144-19-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190927062302.110144-1-ysato@users.sourceforge.jp> References: <20190927062302.110144-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: 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 --- 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 */