From nobody Thu Dec 18 01:21:20 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1591403113; cv=none; d=zohomail.com; s=zohoarc; b=KiYOtgMAWIDvum28e28bU70CRBzm/r0x9WMNHnFVPwn7AS+fVgTZKz4Js1YbCavRWbmSWryNqoy36a4+Lj4yscMsQY9WGjYAtizgV34Hao4keq92JdPyB8jbdlttIC+NUjDpySwSiHXFR6mX0LxNyCbOH4irclsUwNBMc710WxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591403113; 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=iHGH4eY5GNkfLSH1gBPMu+GNi2NhfsAgN8g9xQyGRZw=; b=ef0WzKiaaS/YT7D4OygWqOaqMHPcbC/WAHoLJ0lFz5trarIUoDlQ3P9QrBwY0QOh5h+akaafzzPJ4ELnrw0fwLWju4L74I2vhpB9ASL5oL0eXLWcarjvhpRbSTEEjZ6lAZrrSpCXRBoXBelmKvXZFIxsCeeN+WNU8p5WwzD8d8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1591403113777524.2640432346536; Fri, 5 Jun 2020 17:25:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-82-xRK-oC16OPuKm6K7GBxElQ-1; Fri, 05 Jun 2020 20:24:14 -0400 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 8EE9E107ACCA; Sat, 6 Jun 2020 00:24:09 +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 6DEA5891E5; Sat, 6 Jun 2020 00:24:09 +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 3425A180476D; Sat, 6 Jun 2020 00:24:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 055IWGwW030040 for ; Fri, 5 Jun 2020 14:32:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id A1DD75C296; Fri, 5 Jun 2020 18:32:16 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.40.193.140]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A48D5C5FA for ; Fri, 5 Jun 2020 18:32:13 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id D0A78245140; Fri, 5 Jun 2020 20:31:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591403112; 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=iHGH4eY5GNkfLSH1gBPMu+GNi2NhfsAgN8g9xQyGRZw=; b=c73GyJQ7Ww3ECgRo2CcjCcRx/KsPJnPw3ApWOgYFoBe+oam8udD5ue1aYDzAoWZ2Pe0RrP pSAuXyWaR2Y4au3XPgmiZBnbyWuzuKPqRyMniKjEX7IfVdnmv7J88OiTds/R7/WM+GryL3 TBJKXdZI+0PhOpA7c464BTomFJ92KE4= X-MC-Unique: xRK-oC16OPuKm6K7GBxElQ-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 4/9] qemu: Avoid probing unsupported migratable CPU expansion Date: Fri, 5 Jun 2020 20:31:26 +0200 Message-Id: <45a75575bb8c3cde84c082cfbd0632fe896e13c6.1591380620.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_capabilities.c | 1 + .../caps_2.10.0.s390x.replies | 22 --------- .../caps_2.11.0.s390x.replies | 22 --------- .../caps_2.12.0.s390x.replies | 22 --------- .../caps_2.8.0.s390x.replies | 22 --------- .../caps_2.9.0.s390x.replies | 22 --------- .../caps_3.0.0.s390x.replies | 22 --------- .../caps_4.0.0.s390x.replies | 48 +------------------ .../caps_4.2.0.aarch64.replies | 48 +------------------ .../caps_4.2.0.s390x.replies | 48 +------------------ .../caps_5.0.0.aarch64.replies | 48 +------------------ 11 files changed, 9 insertions(+), 316 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index dab3665f07..7a976b6bbc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3061,6 +3061,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps, =20 /* Try to check migratability of each feature. */ if (modelInfo && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRA= TABLE) && qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_pro= ps, &nonMigratable) < 0) goto cleanup; diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/q= emucapabilitiesdata/caps_2.10.0.s390x.replies index 9cae647bdf..4f7d17b4fe 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -14969,28 +14969,6 @@ "id": "libvirt-35" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-36" -} - -{ - "id": "libvirt-36", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/q= emucapabilitiesdata/caps_2.11.0.s390x.replies index 6b06303f7b..3096559c13 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -15270,28 +15270,6 @@ "id": "libvirt-36" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-37" -} - -{ - "id": "libvirt-37", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/q= emucapabilitiesdata/caps_2.12.0.s390x.replies index 93ad14a6b8..66543f62ee 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -16990,28 +16990,6 @@ "id": "libvirt-38" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-39" -} - -{ - "id": "libvirt-39", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_2.8.0.s390x.replies index 5db900ce80..da9ef050b6 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -13046,28 +13046,6 @@ "id": "libvirt-35" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-36" -} - -{ - "id": "libvirt-36", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_2.9.0.s390x.replies index 503f896892..3aca949683 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -14031,28 +14031,6 @@ "id": "libvirt-35" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-36" -} - -{ - "id": "libvirt-36", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_3.0.0.s390x.replies index 0b35f7e99b..48b5a0ee01 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -17519,28 +17519,6 @@ "id": "libvirt-39" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-40" -} - -{ - "id": "libvirt-40", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_4.0.0.s390x.replies index 70fb54b0e7..d81d5c8003 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies @@ -18338,28 +18338,6 @@ "id": "libvirt-39" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-40" -} - -{ - "id": "libvirt-40", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" @@ -21475,31 +21453,9 @@ "id": "libvirt-3" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "max", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-4" -} - -{ - "id": "libvirt-4", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "query-machines", - "id": "libvirt-5" + "id": "libvirt-4" } =20 { @@ -21572,5 +21528,5 @@ "cpu-max": 248 } ], - "id": "libvirt-5" + "id": "libvirt-4" } diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_4.2.0.aarch64.replies index 4d28047ebe..a16ba89aeb 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies @@ -21376,28 +21376,6 @@ "id": "libvirt-43" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "full", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-44" -} - -{ - "id": "libvirt-44", - "error": { - "class": "GenericError", - "desc": "Parameter 'migratable' is unexpected" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" @@ -21646,31 +21624,9 @@ "id": "libvirt-3" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "full", - "model": { - "name": "max", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-4" -} - -{ - "id": "libvirt-4", - "error": { - "class": "GenericError", - "desc": "Parameter 'migratable' is unexpected" - } -} - { "execute": "query-machines", - "id": "libvirt-5" + "id": "libvirt-4" } =20 { @@ -22221,5 +22177,5 @@ "deprecated": false } ], - "id": "libvirt-5" + "id": "libvirt-4" } diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_4.2.0.s390x.replies index 82b60bf069..9250132d45 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -19157,28 +19157,6 @@ "id": "libvirt-39" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-40" -} - -{ - "id": "libvirt-40", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" @@ -22639,31 +22617,9 @@ "id": "libvirt-3" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "static", - "model": { - "name": "max", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-4" -} - -{ - "id": "libvirt-4", - "error": { - "class": "GenericError", - "desc": "Property '.migratable' not found" - } -} - { "execute": "query-machines", - "id": "libvirt-5" + "id": "libvirt-4" } =20 { @@ -22790,5 +22746,5 @@ "deprecated": false } ], - "id": "libvirt-5" + "id": "libvirt-4" } diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_5.0.0.aarch64.replies index 44f1bc6fb7..9e683ef979 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies @@ -22725,28 +22725,6 @@ "id": "libvirt-43" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "full", - "model": { - "name": "host", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-44" -} - -{ - "id": "libvirt-44", - "error": { - "class": "GenericError", - "desc": "Parameter 'migratable' is unexpected" - } -} - { "execute": "qmp_capabilities", "id": "libvirt-1" @@ -23000,31 +22978,9 @@ "id": "libvirt-3" } =20 -{ - "execute": "query-cpu-model-expansion", - "arguments": { - "type": "full", - "model": { - "name": "max", - "props": { - "migratable": false - } - } - }, - "id": "libvirt-4" -} - -{ - "id": "libvirt-4", - "error": { - "class": "GenericError", - "desc": "Parameter 'migratable' is unexpected" - } -} - { "execute": "query-machines", - "id": "libvirt-5" + "id": "libvirt-4" } =20 { @@ -23612,5 +23568,5 @@ "deprecated": false } ], - "id": "libvirt-5" + "id": "libvirt-4" } --=20 2.27.0