From patchwork Sun Jun 21 12:48:03 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: 191289 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp201686ile; Sun, 21 Jun 2020 05:57:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkpKFL4qL8iyr1PU8w8kC5Sm+EZQNu7vEz71QXE1S25vcX7hXLMBzAip9eZBSk2lfPxv5K X-Received: by 2002:a25:df0b:: with SMTP id w11mr21236573ybg.449.1592744235270; Sun, 21 Jun 2020 05:57:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592744235; cv=none; d=google.com; s=arc-20160816; b=VgPTn8+lmTiOECkVMhr0vtV/5rWwQVwv0I4ofC9lAX8d7VLaXtktxBarjyHe5s4tjU a2LnVykZNz348GmXKz7OrqUc/IBA5miGYIaWxqlU6GPfc2KB/IeIzFGqw3NBWKcqt/RP GA8lYPILqu6Zg/tGU/kK8bcFzjmON2RY11sUEvsf35wj0lwDeVIm3fE/HyYsOjHA8cE+ FlzKItBOUUPejcKaa/L7VPYHUDHCj+/RTd/7SrSv0FUJamytnQrL9TuYlaiEmiHDkrxV xV6WEIByPoeRXVXu3Woz2ftgha1Vk2KMFZmrfYsRXNIyTtBBKHd47++JM6cdtenDhYGm 8kRQ== 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=Dpf2WQ+9OncMaSAGUCQlQ4V9TKb25tpFIldp7EdZQpj/uVTpzw0IGSP3KWG5edd7fv oVffrAHA1xML1DwpQEBEdDOqnick0AzEfjXXkSz8+tdW3Exy4FVCEr41Y6Ed1s46Xv0b ScrLzoOyHJXtp3zgKVzauDsiW8dKWLLjQjyDNtzqL5/YhP2hpXioh+8q6g67alZQQZ5O nmeo1vHgYtAJDJ/lPEyn+EXH0H4jwoE0D9JfDuZtgh3hElk4aY0Q15PCRJ+ZcJBgp3vB S3h21CwGG3JfEaW/HqdtEjW/PI3g0WbIwNIrX0J8ge3uzDLaDYnccpUewAVt8d0RZyE0 VdDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=rUbUvZQP; 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 g15si11919872ybe.188.2020.06.21.05.57.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 21 Jun 2020 05:57:15 -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=rUbUvZQP; 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]:52218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmzX8-0002C3-Pr for patch@linaro.org; Sun, 21 Jun 2020 08:57:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmzOd-0005JJ-Cs for qemu-devel@nongnu.org; Sun, 21 Jun 2020 08:48:27 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:43655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmzOb-0002rQ-PX for qemu-devel@nongnu.org; Sun, 21 Jun 2020 08:48:27 -0400 Received: by mail-wr1-x42a.google.com with SMTP id l10so13990588wrr.10 for ; Sun, 21 Jun 2020 05:48:25 -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=rUbUvZQPRK6l8ahNcHix5CVlOp7Kg4tqkpKQU9wggMl/8GGaYlCj/phzi+DnehhOaV zbJcbjBXo4YKEQWRkqkCxZpjWmvaMSiV22+Pbj+Q7p8Hh07qEgInGrVqn1KaRpJCQW6P hoEKswRBKoX8XPLSMHi/jNXf4V36JitUTVesn3ZcPWJQTJlVd1WRbSO8L8fkLj1C2/l0 I9TT/blOSQo4DsjvfSW8F3j2MaWwHSzFg9jFaWdhk5lby4ezRUOv7ofnd7IQoG61Ect6 NKNj/IYuP4ElNBViH46q/ZhqpnRtqPto4GHw1J+vRmBO8LCq4XN2vXsOI2M+uLvYhvmT TQww== 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=ugvVI3VSBvAhTCDKitC/xTys4M6chOMzrOks49cdxuosnRtFzaDZBFEPSjpQz5WKuR wXW4LRb24IYEMcINZ4m/1rMi+BASX3wAuc66kV0/Bx87xq6z9Ph4jnO7EZ0UYPWSKUcb GwanjmJqCU90pHpjv6SqTIciCRXs0NF6Ee3Fi95JhXgiouOIRbNTnSPCDw4HugkWpkcA IH0Ow8eFoZT7fn+PW/MS8U5Q22sLRnf89elVPk7YO0s49KNPKDxPI9aW5t/x2+h/LT4W nL5F33euGGsodJP5tU03fS9ZuWy9qS8/6cLDmKONpunWG4wfJGlAnFgFtfY0TB3Dyza9 mTgg== X-Gm-Message-State: AOAM532BavsmpCmzd6Rfn7G7xzBrWVem6lU5VgvT0LpCaYW+d22/d3OS DSunEGXJ6Y0YT1n9TSRpsgrYbR5G X-Received: by 2002:a5d:5647:: with SMTP id j7mr5734779wrw.242.1592743703981; Sun, 21 Jun 2020 05:48:23 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id o10sm13779362wrj.37.2020.06.21.05.48.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 05:48:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/15] hw/rx: Honor -accel qtest Date: Sun, 21 Jun 2020 14:48:03 +0200 Message-Id: <20200621124807.17226-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200621124807.17226-1-f4bug@amsat.org> References: <20200621124807.17226-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42a.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: Yoshinori Sato , Magnus Damm , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Richard Henderson 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 */