From nobody Tue Feb 10 00:23:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1672739647; cv=none; d=zohomail.com; s=zohoarc; b=JhCyXbjwe8KzLsjv3Tz1YagklJOlRsCDJa7Dw8Eq4PeBPv7ggGZElzz5oDGnKji3Hbz696Czm2/NE5JjURvFYxful/ez47QKGYIAq0qQcd7RPVUos67Pm/2QSWedIfAzWc06x/XQD6hY1dFfDHret0Zt4wX8DhONNbTkPk8Dp34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672739647; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a/MBPGlllkedrGHix4B9FvfX6RhNy+nU3pavZlSHcWI=; b=cTLWYxOmPFXqg3l1QYLYvpQE2W0C5DiUz3QYAvoXbbbRRJ+tR6i1sIgso9OensmiLY4hLOCzGhRW6NMD0BG0l0345pKi5Vs8etgv1hKZzz8eYoXlMAbwlNNnWXjbfXMgO7/9wzUaZ6dsz7B+t41fQdhYVWOumfTRW5VfQiW5Tr4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1672739647160838.1574901992324; Tue, 3 Jan 2023 01:54:07 -0800 (PST) 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-543-YCs7AwfVNdOoMjP7n8Hubg-1; Tue, 03 Jan 2023 04:53:21 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 37F3C3C0E465; Tue, 3 Jan 2023 09:53:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20BA14014CEA; Tue, 3 Jan 2023 09:53:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 00F92194658C; Tue, 3 Jan 2023 09:53:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C4B7A1946587 for ; Tue, 3 Jan 2023 09:53:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A8325492C18; Tue, 3 Jan 2023 09:53:15 +0000 (UTC) Received: from speedmetal.redhat.com (ovpn-208-20.brq.redhat.com [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19628492C14 for ; Tue, 3 Jan 2023 09:53:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672739645; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=a/MBPGlllkedrGHix4B9FvfX6RhNy+nU3pavZlSHcWI=; b=SKwgfE1einG1y1N9n/RgvvPABFsJmMRj6laqdEfKEwwYucscfBL8Jrxx3c6f+ORvbfVSkQ TWcYJCQI1gD57mebIYD8h9oHKoAXnapYS+hGC9I4cz9wJmzwTzf2Wg57g6RFirPp/Z9cz6 hFI39f5yzCAzeLFSDqkQf3TTzrfNQeM= X-MC-Unique: YCs7AwfVNdOoMjP7n8Hubg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] qemu: capabilities: Introduce QEMU_CAPS_MACHINE_HPET capability Date: Tue, 3 Jan 2023 10:53:00 +0100 Message-Id: <79e977913b9a617def281875559dad04ea64d393.1672739439.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672739649032100003 Content-Type: text/plain; charset="utf-8" The capability represents that qemu accepts the configuration of the HPET timer via -machine hpet=3Don/off rather than the soon-to-be-deprecated '-no-hpet' option. The capability is detected from 'query-command-line-options' which recently added the 'hpet' option. Signed-off-by: Peter Krempa Reviewed-by: Thomas Huth --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 3 +++ tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml | 1 + 3 files changed, 8 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3aba9299b1..7df68f85a1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -680,6 +680,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "sgx-epc", /* QEMU_CAPS_SGX_EPC */ "thread-context", /* QEMU_CAPS_THREAD_CONTEXT */ "screenshot-format-png", /* QEMU_CAPS_SCREENSHOT_FORMAT_PNG = */ + + /* 440 */ + "machine-hpet", /* QEMU_CAPS_MACHINE_HPET */ ); @@ -3283,6 +3286,7 @@ struct virQEMUCapsCommandLineProps { * features should be used if possible. */ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] =3D { { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, + { "machine", "hpet", QEMU_CAPS_MACHINE_HPET }, { "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX }, { "spice", NULL, QEMU_CAPS_SPICE }, { "spice", "gl", QEMU_CAPS_SPICE_GL }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cc8b3759ea..9e90d8badf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -660,6 +660,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_THREAD_CONTEXT, /* -object thread-context */ QEMU_CAPS_SCREENSHOT_FORMAT_PNG, /* screendump command supports png fo= rmat */ + /* 440 */ + QEMU_CAPS_MACHINE_HPET, /* the HPET timer is configured via -machine, = rather than -no-hpet */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0.x86_64.xml index e7ac47e7da..31dc03a780 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml @@ -201,6 +201,7 @@ + 7002050 0 43100244 --=20 2.38.1