From nobody Mon Feb 9 10:34:37 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=1644497245; cv=none; d=zohomail.com; s=zohoarc; b=VI4LLlTwi6qYVIiDKwmr9RZ3PbrtywYYXzfLwQslV1jbp86iAu0q3Lzn3B4TXqFGlSACtNb/Lw9LPbg37ZyAIVTrKtCEELoUTNQrlDTt/mP+e1qPRffi5tatS243QrMmIrHsCzIww6q7MbbEmZMQGGK2aWF/+/BqBTxNXoa8d4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644497245; 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=1qvAcccuPmqTohrxUTuhcZTPqGtYH7lQyvdz+Pmfe68=; b=YZE0hB02xFRoTAsrrp+HmlZ5zDfJDomC2supeuoXf4Y8WiJYR0ikBTptZc2yyCTKPVUTXR3IH7JWDK/4isHLzafArlS3EOFhz5MeEjF8s4HOyNwxL4kz8b0JoyJ0P7wt4lxCGQV7znqSNUahpFAECBFcNcnsk97WwSphmeFXZug= 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 1644497245419940.8608528213499; Thu, 10 Feb 2022 04:47:25 -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-65-h0nTwFgsPn2d-zHg0nHXtg-1; Thu, 10 Feb 2022 07:46:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5943694DDF; Thu, 10 Feb 2022 12:46:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 350BE84638; Thu, 10 Feb 2022 12:46:26 +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 0894A4A7C9; Thu, 10 Feb 2022 12:46:26 +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 21ACk1eV026703 for ; Thu, 10 Feb 2022 07:46:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id 38E5178DFB; Thu, 10 Feb 2022 12:46:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C9F778DF0 for ; Thu, 10 Feb 2022 12:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644497244; 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=1qvAcccuPmqTohrxUTuhcZTPqGtYH7lQyvdz+Pmfe68=; b=HuYTJS4HFesoOzydfJoMspc1fmcPXo55y3xsDLUnBN15A2L678AEl+UO/RD2jF+LTKcSJl AlWR0/FwXEl/CsPHJ03VJHurqiqqnfsAE4dgaLucPFNoUrpGAIQly1ktxheHeR/3f3wWkq BsNsuWJt9V8FseUbogtiYfehmFlyPFQ= X-MC-Unique: h0nTwFgsPn2d-zHg0nHXtg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/19] qemu: capabilities: Retire QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE Date: Thu, 10 Feb 2022 13:45:38 +0100 Message-Id: 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.13 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: 1644497246446100001 Content-Type: text/plain; charset="utf-8" The flag was based on a version check which no longer made sense. Remove the flag by replacing it's only use by an arch-check which is equivalent at this point. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 10 ++-------- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - 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 - 13 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 91a9e75d17..caa92ca4b0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -591,7 +591,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 370 */ "cpu.migratable", /* QEMU_CAPS_CPU_MIGRATABLE */ - "query-cpu-model-expansion.migratable", /* QEMU_CAPS_QUERY_C= PU_MODEL_EXPANSION_MIGRATABLE */ + "query-cpu-model-expansion.migratable", /* X_QEMU_CAPS_QUERY= _CPU_MODEL_EXPANSION_MIGRATABLE */ "fw_cfg", /* X_QEMU_CAPS_FW_CFG */ "migration-param.bandwidth", /* QEMU_CAPS_MIGRATION_PARAM_BA= NDWIDTH */ "migration-param.downtime", /* QEMU_CAPS_MIGRATION_PARAM_DOW= NTIME */ @@ -3080,7 +3080,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, /* Try to check migratability of each feature. */ if (modelInfo && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRA= TABLE) && + ARCH_IS_X86(qemuCaps->arch) && qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_pro= ps, &nonMigratable) < 0) return -1; @@ -5290,12 +5290,6 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) if (ARCH_IS_X86(qemuCaps->arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); - - /* Old x86 QEMU supported migratable:false property in - * query-cpu-model-expansion arguments even though it was not prop= erly - * advertised as a CPU property. - */ - virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRA= TABLE); } if (ARCH_IS_S390(qemuCaps->arch)) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0b8d25e1dd..a52fe2a6f7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -566,7 +566,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 370 */ QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=3Don|off */ - QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-exp= ansion supports migratable:false */ + X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-e= xpansion supports migratable:false */ X_QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */ QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate= -set-parameters */ QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate= -set-parameters */ diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index 53c3ee16d7..c679d6da45 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -174,7 +174,6 @@ - [snipped]