From patchwork Wed Jun 17 19:15:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 190890 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp731447ilo; Wed, 17 Jun 2020 12:21:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6vRVmv90+Pivgr7jbAJkYA7fZLzauRoN6hPUu20EwJaz0FZanh3txCn9p1XBQcm2D53On X-Received: by 2002:a25:69c8:: with SMTP id e191mr608611ybc.331.1592421714026; Wed, 17 Jun 2020 12:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592421714; cv=none; d=google.com; s=arc-20160816; b=ctN4MUZQmLM7LLIBq+MsjuHHbXPWch3T50UmcsUjyqppoqfd2KQen1gsZLYRMtfKi5 5Byfk5ep4YzTAnaiGCYzSGgF+nQ4PUMcoMfa0hAGprC3zJ3TVsIuu+rnn2h8zuUIgEdm Lg+46gipFtzInhiFfIgGPVscNZ7zSTXVbIiI3sBw2Q7pclwKqfbthUxESsxBj0WBHFav +MZeANxMxzKizbwrJkODKnbepSSDF/SnIjz5xkqlrLzv53FwlRDfkhftH9oh/lA0UXUs nVEKF4ZA483yDF83WFNlwU1S3Fps4Slt5TI3f9z9Qi1grOF6H++7bmOXGfL0c2Nqc9jK d6JA== 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 :dkim-signature; bh=nrmkQ/EOlQRnkklRoevO7IWC+EItEHCLWkyyjykQYg4=; b=icU8ofAQ/zOMY9rVRqRWWBlMq/KZ5IdznmYHu90xUDwDNbgQAXz06VnphBw7CTOP1S NAW98s7jjwa6DPKYJJzBqyWJssSMW/w7UppuAySrQ1XjeM6FvcBfKOCI42kH6kV4M6YA 5klStz5h6k9trrFd2POg6kHx0BQuDzcgn72lfrzevh0n0H/9KE95s9dJMuuGdtNLX4q8 2KLfZW7uUXYSuo4qb4pNQICoKLamF52JhDCdlzmTOjdRMKA274AV8vPuPfV+ED85TngA K7IVw1KXLVS9yy2Dkogo/aeAjpiyWMZArhKpW6qKQtNIs24UP9AkkbxU/beegJivOifl Ye/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=dPAlcmlC; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r135si421131ybc.443.2020.06.17.12.21.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jun 2020 12:21:54 -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; dkim=fail header.i=@gmail.com header.s=20161025 header.b=dPAlcmlC; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Received: from localhost ([::1]:55758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlddB-0006sO-Gi for patch@linaro.org; Wed, 17 Jun 2020 15:21:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jldX9-0004Za-21 for qemu-devel@nongnu.org; Wed, 17 Jun 2020 15:15:39 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:34018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jldX7-0006Uc-El for qemu-devel@nongnu.org; Wed, 17 Jun 2020 15:15:38 -0400 Received: by mail-ed1-x543.google.com with SMTP id w7so2976176edt.1 for ; Wed, 17 Jun 2020 12:15:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nrmkQ/EOlQRnkklRoevO7IWC+EItEHCLWkyyjykQYg4=; b=dPAlcmlCz7Pmgi2aakpkHlSsPjaF1Tv31VreSx/DlOR8VyG5i93rcYanKb4p+G5ueR etKJo4urUUgAYCOKb0Aj7hOAfoDgkYBBm5yK94RtV+07NxCq4F4n98CmTXQPkzQTh6z1 Tiprcx5Do3df1ObCYEbtiGRHO+pN2ojN0WJxuPthWZupoCe2855jycq/dQaA5XI5C7bg gb0CiLHlZrldnLVKMYrSRDRiM8IMF3xThuT0KdmOSmRJh+p2IrlEYRPkBDaQsRRyCqao +I4voT0gKEHZC/H8E28h4IaCGtCM0fqPpyDJ0WGfBcP1yGZPPmEXSZjbXQpdGqSZq1XN VO6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nrmkQ/EOlQRnkklRoevO7IWC+EItEHCLWkyyjykQYg4=; b=Wc1ZCOgluHE6paIrfOEQikivAvtH7xw/YRAP4/AHBGwEDgNQUX5ifjcGwg5liyzjsl YSXDJKJKvad3NsHx6VSlBgIHqBwyMAs+Pgf7sRriTJB14ym97Iclyh+DdDEV4WdggFqa FTF3WKhKh89dmbpMy8izFtNeT3dbWF5deOrdBgGTiSBJuoatnKXaeNfCHvPpS9R04Gxb VcMn63bIZBsda/RqWKjbJAz6GOIWa3hjbRC0qCom1RoC12S5/KLLE1LM+4p8JSNv5Lbl /rPgqntBOi0xg4UJBubpPNbVMFubZloXChDLx26wr8EjlmMVcZ8W3jwmMjZg1uQ5ZllJ oZuQ== X-Gm-Message-State: AOAM530vK6ffbuJaU6IR821qZfSDYa/GzRkoHh7NBlm/UZfZRNPjCNk1 6Bq179jt4Flg0BPDWZ4TVms= X-Received: by 2002:a50:f1d9:: with SMTP id y25mr631175edl.292.1592421336156; Wed, 17 Jun 2020 12:15:36 -0700 (PDT) Received: from x1w.redhat.com (93.red-83-59-160.dynamicip.rima-tde.net. [83.59.160.93]) by smtp.gmail.com with ESMTPSA id y21sm324308edl.72.2020.06.17.12.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 12:15:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , Yoshinori Sato , qemu-devel@nongnu.org Subject: [PATCH rc1 11/15] hw/rx: Honor -accel qtest Date: Wed, 17 Jun 2020 21:15:15 +0200 Message-Id: <20200617191519.14842-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200617191519.14842-1-f4bug@amsat.org> References: <20200617191519.14842-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Richard Henderson , Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= 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 Tested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20190531134315.4109-16-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- hw/rx/rx62n.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.21.3 diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index 85b7770023..d8f0fa4625 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" /* @@ -208,7 +210,12 @@ static void rx62n_realize(DeviceState *dev, Error **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 */