From nobody Mon Feb 9 19:53:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556809889; cv=none; d=zoho.com; s=zohoarc; b=Y+gvh98s5oPqTfJlpJ7YBTsZMYkS0/eYnTEYqG7hctXIxsOvFp9vkUt2r7QTnSatqXUAT6cRZsvrqAotQaxmzs92fdT8iJxJ2vqBacSQ3B/uGqsLVaUJ9ehk8yZPM0+TDSTivEeGz3D/muZYl88kMn2V8GrHwYBh0k+R/oTR3Xc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556809889; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=SSi1wpZ+G2d/sCPqQrS20C4GrV0qTiOAcRJB6p6TFX4=; b=RgLQMr1gj75h+jPK8cM+kgc4ZJRw7l0R5cwDNX98IDr43q5rq1vPDqrY5Y50H3ba3q9eKH4pVZSK0t++WSFC+4PbBCwJi3mLTnwaS5x34ptZfzK6INs+3ZhjdaVMsqtEG/F7ku53hV02M83vY6KuTKfFXwUK9oiXLxeIcw1ssa8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556809889108229.88131387684507; Thu, 2 May 2019 08:11:29 -0700 (PDT) Received: from localhost ([127.0.0.1]:52837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMDMu-0004kw-2B for importer@patchew.org; Thu, 02 May 2019 11:11:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4f-0005WL-RV for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4e-00031Z-QU for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42907) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4e-00030t-IX for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:36 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC1B2307D962; Thu, 2 May 2019 14:52:35 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCF6471C80; Thu, 2 May 2019 14:52:31 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:51:59 +0200 Message-Id: <1556808723-226478-12-git-send-email-imammedo@redhat.com> In-Reply-To: <1556808723-226478-1-git-send-email-imammedo@redhat.com> References: <1556808723-226478-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 02 May 2019 14:52:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 11/15] tests: acpi: allow to override default accelerator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Laszlo Ersek , linuxarm@huawei.com, Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , xuwei5@huawei.com, xuwei5@hisilicon.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" By default test cases were run with 'kvm:tcg' accelerators to speed up tests execution. While it works for x86, were change of accelerator doesn't affect ACPI tables, the approach doesn't works for ARM usecase though. In arm/virt case, KVM mode requires using 'host' cpu model, which isn't available in TCG mode. That could be worked around with 'max' cpu model, which works both for KVM and TCG. However in KVM mode it is necessary to specify matching GIC version, which also could use 'max' value to automatically pick GIC version suitable for host's CPU. Depending on host cpu type, different GIC versions would be used, which in turn leads to different ACPI tables (APIC) generated. As result while comparing with reference blobs, test would fail if host's GIC version won't match the version on the host where reference blobs where generated. Let's keep testing simple for now and allow ARM tests run in TCG only mode. To do so introduce 'accel' parameter in test configuration, so test case could override default "kvm:tcg" with accelerator of choice. Signed-off-by: Igor Mammedov Reviewed-by: Laszlo Ersek --- tests/bios-tables-test.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 8302ffc..39c1e24 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -24,6 +24,7 @@ #define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML" =20 typedef struct { + const char *accel; const char *machine; const char *variant; const char *uefi_fl1; @@ -532,8 +533,8 @@ static void test_acpi_one(const char *params, test_data= *data) args =3D g_strdup_printf("-machine %s,accel=3D%s -nodefaults -nogr= aphic " "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don -cdro= m %s %s", - data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2, - data->cd, params ? params : ""); + data->machine, data->accel ? data->accel : "kvm:tcg", + data->uefi_fl1, data->uefi_fl2, data->cd, params ? params : ""= ); =20 } else { /* Disable kernel irqchip to be able to override apic irq0. */ @@ -541,7 +542,8 @@ static void test_acpi_one(const char *params, test_data= *data) "-net none -display none %s " "-drive id=3Dhd0,if=3Dnone,file=3D%s,format=3Draw " "-device ide-hd,drive=3Dhd0 ", - data->machine, "kvm:tcg", params ? params : "", disk); + data->machine, data->accel ? data->accel : "kvm:tcg", + params ? params : "", disk); } =20 data->qts =3D qtest_init(args); --=20 2.7.4