From nobody Mon Feb 9 06:32:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673251972; cv=none; d=zohomail.com; s=zohoarc; b=OQ6dSIbcn1krz6xaUPimFSOKQJvskN0Kq/aKlq0BjvJdN4x0iDIyZoGoSRBxBKs5xXeszGafbd44PfzyXhuuJJqYd4evZ/0e5KdGVxktI0yATMCRE6UZcv0vW6ogWJs1kGyUy+GC8M1cTIXVQcB+qFRklwXlcSLR9Qg2POMHlF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673251972; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Ya+cMYVzdJ59Dwqkd3nDTVFIZ6v+KDYo7sCX8w9FUdY=; b=PvOnFLY0BMFO/J8ZIGVUxcdP1ks2lDCUQkpF+xQp4YcCdlm/QpA83ECAoVW1Ols26OUpiVRBOqtDucqUtghgz0pO3Ru4n7nxAWOfi3EJfJmmblap+OmdoFEm955n3pr7VpHFBs9d5N8rUtNemJpu1YxB0u+xy2ktBqs+rjMWSJg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673251972927129.44790743517729; Mon, 9 Jan 2023 00:12:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEnGR-0000Si-QS; Mon, 09 Jan 2023 03:12:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEnGR-0000SX-1W for qemu-devel@nongnu.org; Mon, 09 Jan 2023 03:12:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEnGO-000568-JQ for qemu-devel@nongnu.org; Mon, 09 Jan 2023 03:12:14 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-467-nTmrwFE6MFyvd4sJxjmCsw-1; Mon, 09 Jan 2023 03:12:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AE60B1C0898D; Mon, 9 Jan 2023 08:12:08 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 691BF53AA; Mon, 9 Jan 2023 08:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673251931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Ya+cMYVzdJ59Dwqkd3nDTVFIZ6v+KDYo7sCX8w9FUdY=; b=L4W2y74k1LpFab8WRdZTIRVdo7HTwoxoFlX6UbXre7JHFNvekmAu2z1+712BZ2gcroYsrg tECvxLXzeOcesLHnTKJ5nB8h5ANBqL/pkbCWqOFCTTQ/aRMDBkbrTLBmeaIp9bfHc4mQnh BtnzaMA6G0vSXoLIzXyh80DZR54wAHU= X-MC-Unique: nTmrwFE6MFyvd4sJxjmCsw-1 From: Thomas Huth To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: Igor Mammedov , Ani Sinha , Peter Maydell Subject: [PATCH] tests/qtest/bios-tables-test: Replace -no-hpet with hpet=off machine parameter Date: Mon, 9 Jan 2023 09:12:05 +0100 Message-Id: <20230109081205.116369-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673251973521100001 Content-Type: text/plain; charset="utf-8" We are going to deprecate (and finally remove later) the -no-hpet command line option. Prepare the bios-tables-test by using the replacement hpet=3Do= ff machine parameter instead. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/qtest/bios-tables-test.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 395d441212..19b5b5a38b 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -78,6 +78,7 @@ typedef struct { bool tcg_only; const char *machine; + const char *machine_param; const char *variant; const char *uefi_fl1; const char *uefi_fl2; @@ -776,26 +777,29 @@ static char *test_acpi_create_args(test_data *data, c= onst char *params, * when arm/virt boad starts to support it. */ if (data->cd) { - args =3D g_strdup_printf("-machine %s %s -accel tcg " + args =3D g_strdup_printf("-machine %s%s %s -accel tcg " "-nodefaults -nographic " "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don -= cdrom %s %s", - data->machine, data->tcg_only ? "" : "-accel kvm", + data->machine, data->machine_param ?: "", + data->tcg_only ? "" : "-accel kvm", data->uefi_fl1, data->uefi_fl2, data->cd, params ? params = : ""); } else { - args =3D g_strdup_printf("-machine %s %s -accel tcg " + args =3D g_strdup_printf("-machine %s%s %s -accel tcg " "-nodefaults -nographic " "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly=3Don " "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don %= s", - data->machine, data->tcg_only ? "" : "-accel kvm", + data->machine, data->machine_param ?: "", + data->tcg_only ? "" : "-accel kvm", data->uefi_fl1, data->uefi_fl2, params ? params : ""); } } else { - args =3D g_strdup_printf("-machine %s %s -accel tcg " + args =3D g_strdup_printf("-machine %s%s %s -accel tcg " "-net none %s " "-drive id=3Dhd0,if=3Dnone,file=3D%s,format=3Draw " "-device %s,drive=3Dhd0 ", - data->machine, data->tcg_only ? "" : "-accel kvm", + data->machine, data->machine_param ?: "", + data->tcg_only ? "" : "-accel kvm", params ? params : "", disk, data->blkdev ?: "ide-hd"); } @@ -1141,8 +1145,9 @@ static void test_acpi_piix4_tcg_nohpet(void) =20 memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; + data.machine_param =3D ",hpet=3Doff"; data.variant =3D ".nohpet"; - test_acpi_one("-no-hpet", &data); + test_acpi_one(NULL, &data); free_test_data(&data); } =20 @@ -1210,8 +1215,9 @@ static void test_acpi_q35_tcg_nohpet(void) =20 memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; + data.machine_param =3D ",hpet=3Doff"; data.variant =3D ".nohpet"; - test_acpi_one("-no-hpet", &data); + test_acpi_one(NULL, &data); free_test_data(&data); } =20 --=20 2.31.1