From nobody Mon Feb 9 00:56:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1644932923; cv=none; d=zohomail.com; s=zohoarc; b=SZy3yPXGWu2xs/5D0pOMRtB11Gd1ed2KaJxmo8W5QMMZRqAkW6LQsFFb8mYo0kWeH0WlQxyoCqk6yju0tOrrrOuZfmWJcNOBI13rq8ifJ1ueqXKnQNMCcG/NPumUxIPftNWK9ohCRrNKAwAiTklhcJLgBGVCjLbGhTO6zmNb78o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644932923; 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=Yo2MK+rVhJpCdqVZN27ekcuOlj1kcIY146pAuYbRhO4=; b=glb/5/X7DZ7H445RweCWdcjBVw95C03buBfRjDqU5xjsmEbCAZp3nGaoN5DylKAJ+TG95zWP61TEHIpAN+YebylhnT++WGRNx4LkZpRXF6uy693h3GbDyBwb7yn2Y+xsn1o+ddw+hdNKM3m3tMoobaCqfwvCLaWTskiHxpNz0EM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1644932923639770.3701468732289; Tue, 15 Feb 2022 05:48:43 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-176-VWv-uakANoGlZXkIiTwvoQ-1; Tue, 15 Feb 2022 08:48:41 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE7B41F2E1; Tue, 15 Feb 2022 13:48:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A0DFD74EB4; Tue, 15 Feb 2022 13:48:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6611C1802E38; Tue, 15 Feb 2022 13:48:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21FDmC3D028361 for ; Tue, 15 Feb 2022 08:48:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 78DBC7CD62; Tue, 15 Feb 2022 13:48:12 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E3A77CD60 for ; Tue, 15 Feb 2022 13:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644932922; 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=Yo2MK+rVhJpCdqVZN27ekcuOlj1kcIY146pAuYbRhO4=; b=PA1++TCTO9w0sJshumFgV4Fbv2ymyyyM9nnHAnfTXNmvXhe2WVzgR051rHiV2z1GU6Amy1 2WIjWI0PFiXc7mcNuCxyFGqPHPkQRd8vfl0Yk4BsfCv9ZdZNMB82rp8jEbH+MTy5wmVuBx +Q1B9YULM1Gcbdnthu2D3Hi57OKDdiA= X-MC-Unique: VWv-uakANoGlZXkIiTwvoQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/17] qemu: capabilities: Remove tautological version checks Date: Tue, 15 Feb 2022 14:47:52 +0100 Message-Id: <4c8897fe7de9d101baf86fe28384f796af9895b2.1644932186.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1644932925515100002 Content-Type: text/plain; charset="utf-8" Some version checks no longer make sense as the minimum supported qemu is now qemu-3.1. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0ff0e12f75..35bf07142a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3261,12 +3261,6 @@ virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) if (qemuCaps->arch !=3D hostArch) return 0; - /* We don't have a nice way to probe whether the QEMU binary - * contains HVF support, but we know that versions older than - * QEMU 2.12 didn't have the feature at all */ - if (qemuCaps->version < 2012000) - return 0; - /* We need the OS to report Hypervisor.framework availability */ if (sysctlbyname("kern.hv_support", &hv_support, &len, NULL, 0) < 0) return 0; @@ -5303,9 +5297,7 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) * query-cpu-model-expansion arguments even though it was not prop= erly * advertised as a CPU property. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE) || - qemuCaps->version < 2012000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_M= IGRATABLE); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRA= TABLE); } if (ARCH_IS_S390(qemuCaps->arch)) { --=20 2.34.1