From nobody Sun Feb 8 21:29:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1572960622; cv=none; d=zoho.com; s=zohoarc; b=QGreko6/TJvRgx1YuHoHei+1/szF7v8nJS5EiCgv+eERq0TINh23hFOzH50oyjF8Xsj1IncbZLbK5kEqgVgf2uXv6ZnZDtCTWaqtWRsi0gEd/5jTFz9YCEktWVFn8HBG3ckTHIDdbGlLqGY+w66C9dHXQXAHryiRHEfmwUW7S9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572960622; 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=bXPUILEL2NsGLvxfNL4H1na4IAE0X+LAXgJprYykte0=; b=kmH9Hi0KZWWCQCNTugAoyqcaqaZfmLqlmVtgWma9MQK9hWXW89djhZrV3KJuPHXIXQxFS2l//YQtcaGf3Edg3CTLuiD3K92GTO8qfXce0ZIzGURnb7ywoMYKwpxmK14+Vdvxz/g+hRzjEw69R8zAWcB4SWgpKgIjWjn8XdeKQIk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1572960622696846.024562262518; Tue, 5 Nov 2019 05:30:22 -0800 (PST) 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-295-gVwRquI6NbuAnUiagnroLA-1; Tue, 05 Nov 2019 08:29:21 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E0BD801E54; Tue, 5 Nov 2019 13:29:16 +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 B3FA56117E; Tue, 5 Nov 2019 13:29:15 +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 594EF180202E; Tue, 5 Nov 2019 13:29:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xA5DS2TF004097 for ; Tue, 5 Nov 2019 08:28:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5CB2A1001902; Tue, 5 Nov 2019 13:28:02 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BEFD1001B00 for ; Tue, 5 Nov 2019 13:28:02 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 46FA9105D84; Tue, 5 Nov 2019 14:27:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572960621; 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=bXPUILEL2NsGLvxfNL4H1na4IAE0X+LAXgJprYykte0=; b=fZUe2t5dsXha8Wd9Y8v5dlvM0e2oBrhpCaO6gg2A49OcwIXr9ikInML+39UYrHf+5n6j/v 8LtubV3JGQL2raLNbznQMndaunogsTNVGDInwBxU+YVrf0XqgYpWsinDYoARwZ8ReeAVho TfR8TVKVNpbl7M3lUTAYc97Mf09kIf8= From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 5 Nov 2019 14:27:40 +0100 Message-Id: <3e6d4a4a0d485292c72b00b30a366ddb5a7b78b4.1572958254.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 42/52] qemu: Probe machine types for both KVM and TCG 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.12 X-MC-Unique: gVwRquI6NbuAnUiagnroLA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Almost all TCG query-machines replies match KVM. The only exceptions are 4.2.0 replies on s390x which differ in the reported default CPU type. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 3: - new patch src/qemu/qemu_capabilities.c | 3 +- .../caps_1.5.3.x86_64.replies | 78 +++ .../caps_1.6.0.x86_64.replies | 86 +++ .../caps_1.7.0.x86_64.replies | 94 +++ .../caps_2.1.1.x86_64.replies | 110 ++++ .../caps_2.10.0.aarch64.replies | 272 +++++++++ .../caps_2.10.0.ppc64.replies | 123 ++++ .../caps_2.10.0.s390x.replies | 53 ++ .../caps_2.10.0.x86_64.replies | 194 ++++++ .../caps_2.11.0.s390x.replies | 58 ++ .../caps_2.11.0.x86_64.replies | 194 ++++++ .../caps_2.12.0.aarch64.replies | 302 ++++++++++ .../caps_2.12.0.ppc64.replies | 143 +++++ .../caps_2.12.0.s390x.replies | 63 ++ .../caps_2.12.0.x86_64.replies | 204 +++++++ .../caps_2.4.0.x86_64.replies | 134 +++++ .../caps_2.5.0.x86_64.replies | 142 +++++ .../caps_2.6.0.aarch64.replies | 180 ++++++ .../caps_2.6.0.ppc64.replies | 77 +++ .../caps_2.6.0.x86_64.replies | 118 ++++ .../caps_2.7.0.s390x.replies | 38 ++ .../caps_2.7.0.x86_64.replies | 154 +++++ .../caps_2.8.0.s390x.replies | 43 ++ .../caps_2.8.0.x86_64.replies | 174 ++++++ .../caps_2.9.0.ppc64.replies | 118 ++++ .../caps_2.9.0.s390x.replies | 48 ++ .../caps_2.9.0.x86_64.replies | 184 ++++++ .../caps_3.0.0.ppc64.replies | 148 +++++ .../caps_3.0.0.riscv32.replies | 42 ++ .../caps_3.0.0.riscv64.replies | 42 ++ .../caps_3.0.0.s390x.replies | 68 +++ .../caps_3.0.0.x86_64.replies | 214 +++++++ .../caps_3.1.0.ppc64.replies | 153 +++++ .../caps_3.1.0.x86_64.replies | 224 +++++++ .../caps_4.0.0.aarch64.replies | 347 +++++++++++ .../caps_4.0.0.ppc64.replies | 158 +++++ .../caps_4.0.0.riscv32.replies | 42 ++ .../caps_4.0.0.riscv64.replies | 42 ++ .../caps_4.0.0.s390x.replies | 78 +++ .../caps_4.0.0.x86_64.replies | 224 +++++++ .../caps_4.1.0.x86_64.replies | 329 +++++++++++ .../caps_4.2.0.aarch64.replies | 556 ++++++++++++++++++ .../caps_4.2.0.ppc64.replies | 267 +++++++++ .../caps_4.2.0.s390x.replies | 132 +++++ .../caps_4.2.0.x86_64.replies | 389 ++++++++++++ 45 files changed, 6841 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d2f307f6a9..1dedcbe5ad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4724,7 +4724,8 @@ virQEMUCapsInitQMPMonitorTCG(virQEMUCapsPtr qemuCaps, if (virQEMUCapsProbeQMPHostCPU(qemuCaps, accel, mon, VIR_DOMAIN_VIRT_Q= EMU) < 0) return -1; =20 - virQEMUCapsAccelCopyMachineTypes(&qemuCaps->tcg, &qemuCaps->kvm); + if (virQEMUCapsProbeQMPMachineTypes(qemuCaps, accel, mon) < 0) + return -1; =20 return 0; } diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.5.3.x86_64.replies index a62b4e98f4..e74273e0d3 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -3145,3 +3145,81 @@ ], "id": "libvirt-2" } + +{ + "execute": "query-machines", + "id": "libvirt-3" +} + +{ + "return": [ + { + "name": "pc-q35-1.4", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.5", + "cpu-max": 255, + "alias": "q35" + }, + { + "name": "isapc", + "cpu-max": 1 + }, + { + "name": "pc-0.10", + "cpu-max": 255 + }, + { + "name": "pc-0.11", + "cpu-max": 255 + }, + { + "name": "pc-0.12", + "cpu-max": 255 + }, + { + "name": "pc-0.13", + "cpu-max": 255 + }, + { + "name": "pc-0.14", + "cpu-max": 255 + }, + { + "name": "pc-0.15", + "cpu-max": 255 + }, + { + "name": "pc-1.0", + "cpu-max": 255 + }, + { + "name": "pc-1.1", + "cpu-max": 255 + }, + { + "name": "pc-1.2", + "cpu-max": 255 + }, + { + "name": "pc-1.3", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.4", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.5", + "is-default": true, + "cpu-max": 255, + "alias": "pc" + }, + { + "name": "none", + "cpu-max": 1 + } + ], + "id": "libvirt-3" +} ... -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list