From nobody Mon Sep 16 19:45:24 2024 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=1678135625; cv=none; d=zohomail.com; s=zohoarc; b=HJPqcQn68XBVazVE/4uyZWFQgC4FFFoLbQihQhAoKg4dAW3xkrCh7mrltbzw6SkpV846WMtgiV3wyPH7gDHZ90m4o+AZVGn8UkRcRXP8EapDMEXPSmazjLkX1+IbEgervMgnU/EQRuvvAgJHjeYosxGkgrdxdif/W7ScLc+4kXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678135625; 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=9KuM2AAjVvvP/kVQN5ki2O0vgYpAv73E7kzoxcEFbaU=; b=agQk/W9x9djaYOSwmb6J9G+A0kVYh9ompOrIg174BQdAUxNJdwoIcQCsD9A03+NEOjkYdNKUN8lKh/WdGdSTGMpQKSoXp0sJcjdZn8InZUF7TLu3B2lTdrUh7gB+TA0Jyq4jzEBrKOB+/78N6k609J1VIzoVs4uWH4hvimLh8Ms= 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 16781356259411020.2857437248189; Mon, 6 Mar 2023 12:47:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-yxK85rwWPFi1-ihAJA2sUQ-1; Mon, 06 Mar 2023 15:47:02 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C6DA857A8E; Mon, 6 Mar 2023 20:46:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A06D492C18; Mon, 6 Mar 2023 20:46:54 +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 7F312194658D; Mon, 6 Mar 2023 20:46:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EC5F21946589 for ; Mon, 6 Mar 2023 20:46:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C1F25440E1; Mon, 6 Mar 2023 20:46:53 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F23151FF for ; Mon, 6 Mar 2023 20:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678135625; 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=9KuM2AAjVvvP/kVQN5ki2O0vgYpAv73E7kzoxcEFbaU=; b=LVrCNLP9oAjGw6rPtamHdAp3SQH3y7s/43UCcZchgNVHW6NY8BQxHVTjhpRdBOoZSkC5ZU TcDQ0LOrJY3SboqSUesja+v4YaNGDkjoyWX0/lPBSaT0Sv+DWiEZeRH3I16z/uMjiPdWTQ m6aDGhD4jHEVIAntdbkAZsInWhkZBX4= X-MC-Unique: yxK85rwWPFi1-ihAJA2sUQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/15] qemu: capabilities: Retire QEMU_CAPS_NO_HPET Date: Mon, 6 Mar 2023 21:46:34 +0100 Message-Id: <57ae361fdce289d4fed45e7c8ef4e05bf0a18578.1678135546.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.9 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: 1678135627085100001 Content-Type: text/plain; charset="utf-8" All uses were replaced by an explicit architecture check. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 15 +++------------ src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 12 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fe0f2f1c4d..4c1f6d11ed 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -110,7 +110,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 30 */ "vhost-net", /* X_QEMU_CAPS_VHOST_NET */ "rtc-td-hack", /* X_QEMU_CAPS_RTC_TD_HACK */ - "no-hpet", /* QEMU_CAPS_NO_HPET */ + "no-hpet", /* X_QEMU_CAPS_NO_HPET */ "no-kvm-pit", /* X_QEMU_CAPS_NO_KVM_PIT */ "tdf", /* X_QEMU_CAPS_TDF */ @@ -5473,12 +5473,6 @@ void virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) { switch (qemuCaps->arch) { - case VIR_ARCH_I686: - case VIR_ARCH_X86_64: - /* HPET is x86 specific */ - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); - break; - case VIR_ARCH_AARCH64: /* gic is arm specific */ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION); @@ -5491,6 +5485,8 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM); break; + case VIR_ARCH_I686: + case VIR_ARCH_X86_64: case VIR_ARCH_ALPHA: case VIR_ARCH_PPC: case VIR_ARCH_PPCEMB: @@ -5568,11 +5564,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qem= uCaps) * on a not entirely related witness. */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_COMPAT_DEPRECATED); - - /* Modern-style config of the HPET timer overrides support for the '-n= o-hpet' - * option */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_HPET)) - virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_HPET); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0110174fea..2bb7f1d87d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -88,7 +88,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for sy= ntax-check */ /* 30 */ X_QEMU_CAPS_VHOST_NET, /* vhost-net support available */ X_QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */ - QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */ + X_QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */ X_QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */ X_QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 6657f7d393..e36983da58 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 8c145d1926..89a083dda8 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index d8a49f0664..f02e843248 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 3c0dde9948..293447644e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index f5977d3e7e..fc6a3ffd4a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index d10b4a6b1e..e5fbc91821 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index aa5361d4dd..fb1ac7a646 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 17a63d09e6..7b77347a31 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index c78c2ea293..b9d5a665a9 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index e55265ee0b..b79700d4f8 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -5,7 +5,6 @@ 0 - --=20 2.39.2