From nobody Fri May 17 11:05:20 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=1671714184; cv=none; d=zohomail.com; s=zohoarc; b=QaKkEc7SoLVmgO95zL3XvT5xXdVxCeM5rSJVgolC87NurMLm7LozCm6pZJtpLDz+7idIf1JDrifb8TME5mbPZybukIrr2o0CvVq8LUUxybpTOxqszreFREgPoEicqXE0NvSyw0UAFjPavusT3ykd1azcy1fFz4aNCeWMd4+7fUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714184; 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=rtOeuTd38yKNYGu7G3icCH1904Bc9g3GsvcZamu+xJA=; b=Xl40/+8DQGnt98rr/HCygnfqF3gtjvb3TMTLPiOtboQa72tcE448lCba1ASonH+qfiujvpi2P1tu2eAG27qV1ydfc7Pyhfcjo9F2bPIdHlMjgUE57ZQsYpAB4wpqpaqndF2oDyBz6TheEb4rXCV8kNmGYBrvdxwWH0/89YJhj30= 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 1671714184267779.6082733304364; Thu, 22 Dec 2022 05:03:04 -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-341-cyC5KnzJNmCfpvCxplMXAg-1; Thu, 22 Dec 2022 08:01:55 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A57CE857D0D; Thu, 22 Dec 2022 13:01:48 +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 92B544085720; Thu, 22 Dec 2022 13:01:48 +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 57A4519465B1; Thu, 22 Dec 2022 13:01:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3036219465A8 for ; Thu, 22 Dec 2022 13:01:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 13B4840C2004; Thu, 22 Dec 2022 13:01:46 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFDE840C2064 for ; Thu, 22 Dec 2022 13:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671714183; 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=rtOeuTd38yKNYGu7G3icCH1904Bc9g3GsvcZamu+xJA=; b=eLm/l0ixYyUOIipf6hjAIn5UTxl3eiCvrLGbkR7d08eQ9zwxrgaUPkWCEVjLQjdCBknCOv DZ5o7M9HeUZW6RzkSXjvstS7A9g3I+mR3elO7XtuM1dmtF8aBE2pdV3RZoovFXtYGCHSdF +/d7koxmYqBS1TjH+3UiArk+PwYVX7k= X-MC-Unique: cyC5KnzJNmCfpvCxplMXAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 1/7] domain_capabilities: s/qemuDomainCapsFeatureFormatSimple/virDomainCapsFeatureFormatSimple/ Date: Thu, 22 Dec 2022 14:01:37 +0100 Message-Id: <6184c310a1807b0b20c3e7e407d5b6fa46494828.1671714076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.2 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: 1671714184687100001 Content-Type: text/plain; charset="utf-8"; x-default="true" There's nothing qemu specific about qemuDomainCapsFeatureFormatSimple() and in fact, the function lives in hypervisor agnostic location and thus mustn't have qemu prefix. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/conf/domain_capabilities.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 247cfa49de..4e412c0fd8 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -335,9 +335,9 @@ virDomainCapsStringValuesFormat(virBuffer *buf, =20 =20 static void -qemuDomainCapsFeatureFormatSimple(virBuffer *buf, - const char *featurename, - virTristateBool supported) +virDomainCapsFeatureFormatSimple(virBuffer *buf, + const char *featurename, + virTristateBool supported) { if (supported =3D=3D VIR_TRISTATE_BOOL_ABSENT) return; @@ -697,9 +697,9 @@ virDomainCapsFormatFeatures(const virDomainCaps *caps, if (i =3D=3D VIR_DOMAIN_CAPS_FEATURE_IOTHREADS) continue; =20 - qemuDomainCapsFeatureFormatSimple(&childBuf, - virDomainCapsFeatureTypeToString= (i), - caps->features[i]); + virDomainCapsFeatureFormatSimple(&childBuf, + virDomainCapsFeatureTypeToString(= i), + caps->features[i]); } =20 virDomainCapsFeatureSEVFormat(&childBuf, caps->sev); @@ -728,8 +728,8 @@ virDomainCapsFormat(const virDomainCaps *caps) if (caps->maxvcpus) virBufferAsprintf(&buf, "\n", caps->maxvcpus); =20 - qemuDomainCapsFeatureFormatSimple(&buf, "iothreads", - caps->features[VIR_DOMAIN_CAPS_FEATU= RE_IOTHREADS]); + virDomainCapsFeatureFormatSimple(&buf, "iothreads", + caps->features[VIR_DOMAIN_CAPS_FEATUR= E_IOTHREADS]); =20 virDomainCapsOSFormat(&buf, &caps->os); virDomainCapsCPUFormat(&buf, &caps->cpu); --=20 2.38.2 From nobody Fri May 17 11:05:20 2024 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=1671714188; cv=none; d=zohomail.com; s=zohoarc; b=Li/bhn3TccQ0oNx44ITdKIxj3haE9y+n+9pqQRyYYeGvQzyfwlbBLacrTbxQO1zB/umiohh+dOXo2MatABxjjnFXHbk8jhtYmbtLYybWEn6eFPX31XtMBdFj7w+ceuVWPPq1GOUlS7jgj8secF5qqmFzbVlcSZBrY1l9Q07LPuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714188; 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=uOFO1yVQ8yUMMUCML2/LqPjIDlF1ACiNNtVWIVPM80k=; b=H+6+zSX7EUeStP4uRWEL1m74kaYsjoAxrJHUOcOkuuq3SCo5qe4mVHkYDXAK1sczjveZFuQQ5x06cTctubozEGm654wntDv45mr0cypROykoe47FvCsuuVwKoNaAEmj5u/sMyNIjIRaU9SBNTGY7uiwKQqqf6jNVPSKDmONmELI= 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 1671714188104457.2064838365584; Thu, 22 Dec 2022 05:03:08 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-267-E289zV1DPlGdgS2_6yQUFQ-1; Thu, 22 Dec 2022 08:01:52 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 57E9F3C10176; Thu, 22 Dec 2022 13:01:48 +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 E396840C1073; Thu, 22 Dec 2022 13:01:47 +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 A9B8919465B2; Thu, 22 Dec 2022 13:01:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B029D1946A6B for ; Thu, 22 Dec 2022 13:01:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A28DC40C2004; Thu, 22 Dec 2022 13:01:46 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A46340C2064 for ; Thu, 22 Dec 2022 13:01:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671714187; 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=uOFO1yVQ8yUMMUCML2/LqPjIDlF1ACiNNtVWIVPM80k=; b=GyuvVMEjFdOLUZVyzyFaFYi/4OAuGlTyaDle54H5UqD0L6fdst3t52iVRy8tr13Ztm1q24 4xGUp08TCdBi/IAbVFOvgAMyMIXMi1eMCEX5Yvm36TxRebdBkS0W4tlVlIjoRh3lN4ui8C d+sL0SETVBqPEX549zWdeB5fo6mJiSs= X-MC-Unique: E289zV1DPlGdgS2_6yQUFQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 2/7] qemu_capabilities: Decrease scope of @hash in virQEMUCapsProbeQMPHostCPU() Date: Thu, 22 Dec 2022 14:01:38 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.2 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: 1671714188725100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The @hash variable inside of virQEMUCapsProbeQMPHostCPU() is used only within a loop, but declared at the beginning of the function. Bring the variable declaration into the said loop. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3aba9299b1..adcd3b21a6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3035,7 +3035,6 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, const char *model =3D virQEMUCapsTypeIsAccelerated(virtType) ? "host" = : "max"; g_autoptr(qemuMonitorCPUModelInfo) modelInfo =3D NULL; g_autoptr(qemuMonitorCPUModelInfo) nonMigratable =3D NULL; - g_autoptr(GHashTable) hash =3D NULL; g_autoptr(virCPUDef) cpu =3D NULL; qemuMonitorCPUModelExpansionType type; bool fail_no_props =3D true; @@ -3079,6 +3078,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, return -1; =20 if (nonMigratable) { + g_autoptr(GHashTable) hash =3D NULL; qemuMonitorCPUProperty *prop; qemuMonitorCPUProperty *nmProp; size_t i; --=20 2.38.2 From nobody Fri May 17 11:05:20 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=1671714121; cv=none; d=zohomail.com; s=zohoarc; b=FIGPu5agY2bX5jaPyyBcgLdKhRgGS0QVYFMwTNXjvnVtrmnkIzCQ+vMoJW4PEXrHq4SGCTeVeDY0UYpzbv42BhMajq8OuNtMFSm9JTx0xglJ+QGFbmJKuwTnpS5yfawurnlDlA4AWv6WXDP/4Su1oPL6wghYYLiHRBrFAhftx7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714121; 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=xWZ072vR4hc7j0S7NiD8LGDri5cRoRlsuCvAqiiZ5KM=; b=g/EAMJqqdqDQOtKjsNoETAaEkipEFOi+vk0DO7rBHe+7847bDuS/ERSakS2W0hmVxhkxp4rD6wDzS1YktYgGVmj4WFEsfdzX3dHbWqQ+P3Vsd2BHontQ9CjCTMOacRFvdpRfPdBDKnwf4IzD+Xv/nA9iiUFN9pEJO8ITFs+yxlU= 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 1671714121802827.1649826863201; Thu, 22 Dec 2022 05:02:01 -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-675-mKc8LEkfPsaAnPvGoppXKg-1; Thu, 22 Dec 2022 08:01:54 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16AAC8F6E9A; Thu, 22 Dec 2022 13:01:49 +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 017C549BB6A; Thu, 22 Dec 2022 13:01:48 +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 9156C1946A74; Thu, 22 Dec 2022 13:01:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 56F0119465A8 for ; Thu, 22 Dec 2022 13:01:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3CB3340C2004; Thu, 22 Dec 2022 13:01:47 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id D88D340C2064 for ; Thu, 22 Dec 2022 13:01:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671714120; 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=xWZ072vR4hc7j0S7NiD8LGDri5cRoRlsuCvAqiiZ5KM=; b=DekY+oYkavsVNjM0lwJMIsYXxjsodmdDkPOiSzjwrrY77FvtGOoViXRIH1b4dC5c+QUqI0 oQ6yLfwcaR/qc3YZ++vJJdp5HIEUMqs2R86DnhVcW1TbgHaZM4v/9dWfR8BgBxGERRAqBM 78JrhxHw9ikf3GBt3RYfz/6BCUcsCM0= X-MC-Unique: mKc8LEkfPsaAnPvGoppXKg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 3/7] qemuMonitorJSONMakeCPUModel: Introduce @hv_passthrough argument Date: Thu, 22 Dec 2022 14:01:39 +0100 Message-Id: <9e0e80dc6ddf55f0a9af436c823c59d8c42ba1f5.1671714076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.10 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: 1671714125069100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Apart from setting @migratable prop to the query-cpu-model-expansion command, we will need @hv-passthrough so that we can query for expansion of Hyper-V Enlightenments supported on the current host. The idea is to run: { "execute": "query-cpu-model-expansion", "arguments": { "type": "full", "model": { "name": "host", "props": { "hv-passthrough": true } } } } Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_monitor_json.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9822097bd7..f9928b0393 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4921,7 +4921,8 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, =20 static virJSONValue * qemuMonitorJSONMakeCPUModel(virCPUDef *cpu, - bool migratable) + bool migratable, + bool hv_passthrough) { g_autoptr(virJSONValue) model =3D virJSONValueNewObject(); size_t i; @@ -4929,7 +4930,7 @@ qemuMonitorJSONMakeCPUModel(virCPUDef *cpu, if (virJSONValueObjectAppendString(model, "name", cpu->model) < 0) return NULL; =20 - if (cpu->nfeatures || !migratable) { + if (cpu->nfeatures || !migratable || hv_passthrough) { g_autoptr(virJSONValue) props =3D virJSONValueNewObject(); =20 for (i =3D 0; i < cpu->nfeatures; i++) { @@ -4951,6 +4952,11 @@ qemuMonitorJSONMakeCPUModel(virCPUDef *cpu, return NULL; } =20 + if (hv_passthrough && + virJSONValueObjectAppendBoolean(props, "hv-passthrough", true)= < 0) { + return NULL; + } + if (virJSONValueObjectAppend(model, "props", &props) < 0) return NULL; } @@ -5079,7 +5085,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon, =20 *model_info =3D NULL; =20 - if (!(model =3D qemuMonitorJSONMakeCPUModel(cpu, migratable))) + if (!(model =3D qemuMonitorJSONMakeCPUModel(cpu, migratable, false))) return -1; =20 if ((rc =3D qemuMonitorJSONQueryCPUModelExpansionOne(mon, type, &model= , &data)) <=3D 0) @@ -5128,8 +5134,8 @@ qemuMonitorJSONGetCPUModelBaseline(qemuMonitor *mon, virJSONValue *cpu_props =3D NULL; const char *cpu_name =3D ""; =20 - if (!(model_a =3D qemuMonitorJSONMakeCPUModel(cpu_a, true)) || - !(model_b =3D qemuMonitorJSONMakeCPUModel(cpu_b, true))) + if (!(model_a =3D qemuMonitorJSONMakeCPUModel(cpu_a, true, false)) || + !(model_b =3D qemuMonitorJSONMakeCPUModel(cpu_b, true, false))) return -1; =20 if (!(cmd =3D qemuMonitorJSONMakeCommand("query-cpu-model-baseline", @@ -5166,8 +5172,8 @@ qemuMonitorJSONGetCPUModelComparison(qemuMonitor *mon, const char *data_result; virJSONValue *data; =20 - if (!(model_a =3D qemuMonitorJSONMakeCPUModel(cpu_a, true)) || - !(model_b =3D qemuMonitorJSONMakeCPUModel(cpu_b, true))) + if (!(model_a =3D qemuMonitorJSONMakeCPUModel(cpu_a, true, false)) || + !(model_b =3D qemuMonitorJSONMakeCPUModel(cpu_b, true, false))) return -1; =20 if (!(cmd =3D qemuMonitorJSONMakeCommand("query-cpu-model-comparison", --=20 2.38.2 From nobody Fri May 17 11:05:20 2024 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=1671714191; cv=none; d=zohomail.com; s=zohoarc; b=V9n+UJIPpNuEOQfwWqyGDeZ5XEyMNEfYYEU0oVPO2xHZoNRJfkmCr29B34nTFbk6gDW5irpnOp30WbfWMw9qz7N2imhbvouPtfU7P1NnLGBO5UX5TCZYEKIiHt2JoqbvLl+tHipbdznDG+bZD52Q/FXFoKeyJYn7MNjGHn4vXTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714191; 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=d1y0GqtptSotEXQzDcTOBkw9wJxBM96Lqu/UgBp5rOA=; b=eP0ivg7PIsP422/R8QGiiB6hIYND+BWUyx9YuKyo1BaWpJhC7ONVu3rSBCkIWpYWQMPooMGXOiPxZdOKIo02uZFFHj+jr7bXNLqJGSEZEPRvA3uxRpH4/4YS8wlSGyZjqjjy9SYg8QGsJzpb/EFvEHxuksesB+moWFNQozDvXjM= 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 1671714191321912.6295813743311; Thu, 22 Dec 2022 05:03:11 -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-384-cumgyX0gN9C4JfNZWVOxCg-1; Thu, 22 Dec 2022 08:01:56 -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 026E780D0EA; Thu, 22 Dec 2022 13:01:50 +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 E2169492C14; Thu, 22 Dec 2022 13:01:49 +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 CBB9E19465B1; Thu, 22 Dec 2022 13:01:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E7ABF1946A74 for ; Thu, 22 Dec 2022 13:01:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CBF1440C2005; Thu, 22 Dec 2022 13:01:47 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7377440C2004 for ; Thu, 22 Dec 2022 13:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671714190; 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=d1y0GqtptSotEXQzDcTOBkw9wJxBM96Lqu/UgBp5rOA=; b=eEpTg8SnP0c5sDiG+a2nF3EgrKE2HvIvEoHNWXJ3QJ6SXdjudshF18CE2wVEgFLPgHKiwH rC/OZOPtwXuhzlp3qcjeKTT1uSjdYVwD/D+pvi4LHqhKVRFrB2gEzs2uDaysgYcGxe1lOS dfhPR71Y9jGwD+tPToOd7DaUKqnJtao= X-MC-Unique: cumgyX0gN9C4JfNZWVOxCg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 4/7] qemuMonitorJSONGetCPUModelExpansion: Introduce @hv_passthrough argument Date: Thu, 22 Dec 2022 14:01:40 +0100 Message-Id: <6b83a0637a03305943e75baa01ffaec1f27ebf93.1671714076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1671714192734100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This continues and finishes propagation of the @hv_passthrough argument started in the previous commit. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 8 ++++---- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_monitor.c | 5 +++-- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 3 ++- src/qemu/qemu_monitor_json.h | 1 + tests/cputest.c | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index adcd3b21a6..feed510acd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3066,15 +3066,15 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, if (ARCH_IS_S390(qemuCaps->arch)) fail_no_props =3D false; =20 - if (qemuMonitorGetCPUModelExpansion(mon, type, cpu, true, fail_no_prop= s, - &modelInfo) < 0) + if (qemuMonitorGetCPUModelExpansion(mon, type, cpu, true, false, + fail_no_props, &modelInfo) < 0) return -1; =20 /* Try to check migratability of each feature. */ if (modelInfo && ARCH_IS_X86(qemuCaps->arch) && - qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_pro= ps, - &nonMigratable) < 0) + qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, false, + fail_no_props, &nonMigratable) < 0) return -1; =20 if (nonMigratable) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d509582719..13ef9285fc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12210,7 +12210,8 @@ qemuConnectCPUModelBaseline(virQEMUCaps *qemuCaps, : QEMU_MONITOR_CPU_MODEL_EXPANSIO= N_STATIC; =20 if (qemuMonitorGetCPUModelExpansion(proc->mon, expansion_type, - baseline, true, false, &result= ) < 0) + baseline, true, + false, false, &result) < 0) return NULL; =20 if (qemuConnectStealCPUModelFromInfo(baseline, &result) < 0) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 734364e070..b2e4311ea9 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3181,6 +3181,7 @@ qemuMonitorGetCPUModelExpansion(qemuMonitor *mon, qemuMonitorCPUModelExpansionType type, virCPUDef *cpu, bool migratable, + bool hv_passthrough, bool fail_no_props, qemuMonitorCPUModelInfo **model_info) { @@ -3189,8 +3190,8 @@ qemuMonitorGetCPUModelExpansion(qemuMonitor *mon, QEMU_CHECK_MONITOR(mon); =20 return qemuMonitorJSONGetCPUModelExpansion(mon, type, cpu, - migratable, fail_no_props, - model_info); + migratable, hv_passthrough, + fail_no_props, model_info); } =20 =20 diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 906a919f52..0d4a52bf4a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1140,6 +1140,7 @@ int qemuMonitorGetCPUModelExpansion(qemuMonitor *mon, qemuMonitorCPUModelExpansionType type, virCPUDef *cpu, bool migratable, + bool hv_passthrough, bool fail_no_props, qemuMonitorCPUModelInfo **model_info); =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f9928b0393..3b96f4e037 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5072,6 +5072,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon, qemuMonitorCPUModelExpansionType type, virCPUDef *cpu, bool migratable, + bool hv_passthrough, bool fail_no_props, qemuMonitorCPUModelInfo **model_info) { @@ -5085,7 +5086,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon, =20 *model_info =3D NULL; =20 - if (!(model =3D qemuMonitorJSONMakeCPUModel(cpu, migratable, false))) + if (!(model =3D qemuMonitorJSONMakeCPUModel(cpu, migratable, hv_passth= rough))) return -1; =20 if ((rc =3D qemuMonitorJSONQueryCPUModelExpansionOne(mon, type, &model= , &data)) <=3D 0) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 484cb09830..a86f054b8b 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -449,6 +449,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon, qemuMonitorCPUModelExpansionType type, virCPUDef *cpu, bool migratable, + bool hv_passthrough, bool fail_no_props, qemuMonitorCPUModelInfo **model_info) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6); diff --git a/tests/cputest.c b/tests/cputest.c index 52e0022ac3..9b76cce2a8 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -455,7 +455,7 @@ cpuTestMakeQEMUCaps(const struct data *data) =20 if (qemuMonitorGetCPUModelExpansion(qemuMonitorTestGetMonitor(testMon), QEMU_MONITOR_CPU_MODEL_EXPANSION_S= TATIC, - cpu, true, fail_no_props, &model) = < 0) + cpu, true, false, fail_no_props, &= model) < 0) return NULL; =20 if (!(qemuCaps =3D virQEMUCapsNew())) --=20 2.38.2 From nobody Fri May 17 11:05:20 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=1671714128; cv=none; d=zohomail.com; s=zohoarc; b=PssxEGbTyyLISvm8Ouyqd1bdZDA1u+kApWyBC8+yX/FdVZElHgHQ4Mxwdx9onYw0Uy6QEtgzCqxcCMImEPWtLeYfs4qnGWkhj4Wisl/n7M+JT53xkM9UOKAb0Z6PWRnIDlD2s2QlZuHIr4OmjhGitAhdn7il0ODefVSsP+U4pFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714128; 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=XEDcT1Y9iSZrMls6us+/L0BdjJ1KZOhTXkSE1FlckVk=; b=GLnfHyBN2JMc8smxr9ee2ZpitlLSj+8dHianJjzVStHrr2PWcDtDqnCbPFj30kgw5+OE6yftl7wiBcCjvmto2WTxmJl6eNbFVIezIoz0T+yoWe/ZPPpRikFwXWdLLjpVQkqg5ZInJIM1Ox+XX6Opa5ynK1pH5amen3inxedlY00= 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 1671714128196116.81781322795939; Thu, 22 Dec 2022 05:02:08 -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-455-A2l4IuPfN2WocTbOf0-A4A-1; Thu, 22 Dec 2022 08:01:55 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9220D18A647B; Thu, 22 Dec 2022 13:01:50 +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 3169239D93; Thu, 22 Dec 2022 13:01:50 +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 1025D1946A6B; Thu, 22 Dec 2022 13:01:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E39A219465B2 for ; Thu, 22 Dec 2022 13:01:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D812540C2005; Thu, 22 Dec 2022 13:01:48 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1142840C2004 for ; Thu, 22 Dec 2022 13:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671714126; 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=XEDcT1Y9iSZrMls6us+/L0BdjJ1KZOhTXkSE1FlckVk=; b=LCWGoKBVZvqzIviBlUVUQQAjCdmoziX2HJDVFKXZox5eJveDDSdowDUsu12NPm227qIgsc tpZmNwrrZOTqdi1YI7VkuRcyJkxYzpeQTlRA0hKh6NkR6zYG2bo6U6hM91w6RXFdi0T4pw 3xtgZDfqCpVlBSjV+DA/w12N9ilVNms= X-MC-Unique: A2l4IuPfN2WocTbOf0-A4A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 5/7] qemu_capabilities: Query for Hyper-V Enlightenments Date: Thu, 22 Dec 2022 14:01:41 +0100 Message-Id: <737a5c196ce2c8f50aa6e0da5646bf57a35b5ec5.1671714076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.5 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: 1671714131340100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that we have qemuMonitorGetCPUModelExpansion() aware of Hyper-V Enlightenments, we can start querying it. Two conditions need to be met: 1) KVM is in use, 2) Arch is either x86 or arm. It may look like modifying the first call to qemuMonitorGetCPUModelExpansion() inside of virQEMUCapsProbeQMPHostCPU() would be sufficient but it is not. We really need to ask QEMU for full expansion and the first call does not guarantee that. For the test data, I've just copied whatever 'query-cpu-model-expansion' returned earlier, therefore there are no hv-* props. But that's okay - the full expansion is not stored in cache (and thus not formatted in tests/qemucapabilitiesdata/caps_*.replies files either). This is purely runtime thing. Signed-off-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 19 + .../caps_4.2.0.aarch64.replies | 45 +++ .../caps_4.2.0.x86_64.replies | 317 ++++++++++++++++ .../caps_5.0.0.aarch64.replies | 46 +++ .../caps_5.0.0.x86_64.replies | 318 ++++++++++++++++ .../caps_5.1.0.x86_64.replies | 323 ++++++++++++++++ .../caps_5.2.0.aarch64.replies | 47 +++ .../caps_5.2.0.x86_64.replies | 324 ++++++++++++++++ .../caps_6.0.0.aarch64.replies | 47 +++ .../caps_6.0.0.x86_64.replies | 336 +++++++++++++++++ .../caps_6.1.0.x86_64.replies | 338 +++++++++++++++++ .../caps_6.2.0.aarch64.replies | 47 +++ .../caps_6.2.0.x86_64.replies | 348 +++++++++++++++++ .../caps_7.0.0.aarch64.replies | 48 +++ .../caps_7.0.0.x86_64.replies | 352 +++++++++++++++++ .../caps_7.1.0.x86_64.replies | 353 ++++++++++++++++++ .../caps_7.2.0.x86_64.replies | 353 ++++++++++++++++++ 17 files changed, 3661 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index feed510acd..fd09d52b6d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -711,6 +711,9 @@ struct _virQEMUCapsHostCPUData { * combined with features reported by QEMU. This is used for backward * compatible comparison between a guest CPU and a host CPU. */ virCPUDef *full; + /* Full CPU definition expanded by QEMU, including Hyper-V Enlightenme= nts. + */ + qemuMonitorCPUModelInfo *fullQEMU; }; =20 typedef struct _virQEMUCapsAccel virQEMUCapsAccel; @@ -1854,6 +1857,10 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUData *d= st, !(dst->full =3D virCPUDefCopy(src->full))) return -1; =20 + if (src->fullQEMU && + !(dst->fullQEMU =3D qemuMonitorCPUModelInfoCopy(src->fullQEMU))) + return -1; + return 0; } =20 @@ -1865,6 +1872,7 @@ virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUData *c= puData) virCPUDefFree(cpuData->reported); virCPUDefFree(cpuData->migratable); virCPUDefFree(cpuData->full); + qemuMonitorCPUModelInfoFree(cpuData->fullQEMU); =20 memset(cpuData, 0, sizeof(*cpuData)); } @@ -3109,6 +3117,17 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps, modelInfo->migratability =3D true; } =20 + if (virQEMUCapsTypeIsAccelerated(virtType) && + (ARCH_IS_X86(qemuCaps->arch) || ARCH_IS_ARM(qemuCaps->arch))) { + g_autoptr(qemuMonitorCPUModelInfo) fullQEMU =3D NULL; + + if (qemuMonitorGetCPUModelExpansion(mon, QEMU_MONITOR_CPU_MODEL_EX= PANSION_FULL, + cpu, false, true, true, &fullQ= EMU) < 0) + return -1; + + accel->hostCPU.fullQEMU =3D g_steal_pointer(&fullQEMU); + } + accel->hostCPU.info =3D g_steal_pointer(&modelInfo); return 0; } diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_4.2.0.aarch64.replies index f947ce9aee..f8619d8843 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies @@ -21525,6 +21525,51 @@ "id": "libvirt-42" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-43" +} + +{ + "return": { + "model": { + "name": "host", + "props": { + "sve768": false, + "sve128": true, + "sve1024": false, + "sve1280": false, + "sve896": false, + "sve256": true, + "sve1536": false, + "sve1792": false, + "sve384": false, + "sve": true, + "sve2048": false, + "sve512": true, + "aarch64": true, + "pmu": true, + "sve1920": false, + "sve1152": false, + "sve640": false, + "sve1408": false, + "sve1664": false + } + } + }, + "id": "libvirt-43" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_4.2.0.x86_64.replies index 12ebc41e49..a45fd2f669 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies @@ -24185,6 +24185,323 @@ "id": "libvirt-47" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-48" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": true, + "mmx": true, + "rdpid": false, + "arat": true, + "vmx-page-walk-4": true, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": true, + "pause-filter": false, + "xsavec": true, + "intel-pt": false, + "vmx-cr8-store-exit": true, + "vmx-rdseed-exit": true, + "vmx-eptp-switching": true, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": true, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 6, + "vmx-vmwrite-vmexit-fields": true, + "vmx-vnmi": true, + "vmx-true-ctls": true, + "vmx-ept-execonly": true, + "vmx-exit-save-efer": true, + "vmx-invept-all-context": true, + "wbnoinvd": false, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "vmx-exit-load-pat": true, + "vmx-intr-exit": true, + "min-level": 22, + "vmx-flexpriority": true, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "avx512-bf16": false, + "vmx-cr8-load-exit": true, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": true, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": true, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": false, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": true, + "xcrypt-en": false, + "vmx-mwait-exit": true, + "vmx-pml": true, + "vmx-nmi-exit": true, + "vmx-invept-single-context-noglobals": true, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "GenuineIntel", + "vmx-unrestricted-guest": true, + "vmx-cr3-store-noexit": true, + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": true, + "3dnowext": false, + "amd-no-ssb": false, + "npt": false, + "rdctl-no": false, + "vmx-invvpid": true, + "clwb": false, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": true, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": true, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": true, + "vmx-invvpid-all-context": true, + "vmx-activity-hlt": true, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": true, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": true, + "hypervisor": true, + "vmx-rdtscp-exit": true, + "mds-no": false, + "pcommit": false, + "vmx-vpid": true, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": true, + "vmx-monitor-exit": true, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": true, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": true, + "waitpkg": false, + "cldemote": false, + "vmx-ept": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 94, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "vmx-pause-exit": true, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": true, + "la57": false, + "vmx-invept": true, + "osvw": false, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": true, + "vmx-eptad": true, + "spec-ctrl": true, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "vmx-rdrand-exit": true, + "lwp": false, + "amd-ssbd": false, + "xop": false, + "ibpb": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": true, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": true, + "vmx-ept-1gb": true, + "ht": false, + "vmx-io-exit": true, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "vaes": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": true, + "lm": true, + "vmx-exit-save-preemption-timer": true, + "vmx-entry-load-pat": true, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": true, + "umip": true, + "vmx-store-lma": true, + "vmx-movdr-exit": true, + "pse": true, + "avx2": true, + "sep": true, + "virt-ssbd": false, + "vmx-cr3-load-noexit": true, + "nodeid-msr": false, + "md-clear": true, + "misalignsse": false, + "split-lock-detect": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "vmx-preemption-timer": true, + "clflushopt": true, + "vmx-vnmi-pending": true, + "monitor": false, + "vmx-vintr-pending": true, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "taa-no": false, + "arch-capabilities": true, + "vmx-secondary-ctls": true, + "vmx-xsaves": true, + "clzero": false, + "3dnow": false, + "erms": true, + "vmx-entry-ia32e-mode": true, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": true, + "fxsr-opt": false, + "xstore": false, + "rtm": true, + "kvm-hint-dedicated": false, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": false, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": true, + "vmx-mtf": true, + "vmx-entry-load-efer": true, + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "sha-ni": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": true, + "xstore-en": false + } + } + }, + "id": "libvirt-48" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_5.0.0.aarch64.replies index 9f7d3da252..e63c9d5f0a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies @@ -22879,6 +22879,52 @@ "id": "libvirt-43" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-44" +} + +{ + "return": { + "model": { + "name": "host", + "props": { + "sve768": false, + "sve128": false, + "sve1024": false, + "sve1280": false, + "sve896": false, + "sve256": false, + "sve1536": false, + "sve1792": false, + "sve384": false, + "sve": false, + "sve2048": false, + "kvm-no-adjvtime": false, + "sve512": false, + "aarch64": true, + "pmu": true, + "sve1920": false, + "sve1152": false, + "sve640": false, + "sve1408": false, + "sve1664": false + } + } + }, + "id": "libvirt-44" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_5.0.0.x86_64.replies index 81cfc70dc4..13b9b02e4c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies @@ -25639,6 +25639,324 @@ "id": "libvirt-48" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-49" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": true, + "mmx": true, + "rdpid": false, + "arat": true, + "vmx-page-walk-4": true, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": true, + "pause-filter": false, + "xsavec": true, + "intel-pt": false, + "vmx-cr8-store-exit": true, + "vmx-rdseed-exit": true, + "vmx-eptp-switching": true, + "kvm-asyncpf": true, + "perfctr-core": false, + "mpx": true, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": true, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 6, + "vmx-vmwrite-vmexit-fields": true, + "vmx-vnmi": true, + "vmx-true-ctls": true, + "vmx-ept-execonly": true, + "vmx-exit-save-efer": true, + "vmx-invept-all-context": true, + "wbnoinvd": false, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "vmx-exit-load-pat": true, + "vmx-intr-exit": true, + "min-level": 22, + "vmx-flexpriority": true, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "avx512-bf16": false, + "vmx-cr8-load-exit": true, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": true, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": true, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": false, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": true, + "xcrypt-en": false, + "vmx-mwait-exit": true, + "vmx-pml": true, + "vmx-nmi-exit": true, + "vmx-invept-single-context-noglobals": true, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "GenuineIntel", + "vmx-unrestricted-guest": true, + "vmx-cr3-store-noexit": true, + "pku": false, + "smx": false, + "cmp-legacy": false, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": true, + "3dnowext": false, + "amd-no-ssb": false, + "npt": false, + "rdctl-no": false, + "vmx-invvpid": true, + "clwb": false, + "lbrv": false, + "adx": true, + "ss": true, + "pni": true, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": true, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": true, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": true, + "vmx-invvpid-all-context": true, + "vmx-activity-hlt": true, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": true, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": true, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": true, + "hypervisor": true, + "vmx-rdtscp-exit": true, + "mds-no": false, + "pcommit": false, + "vmx-vpid": true, + "syscall": true, + "avx512dq": false, + "svm": false, + "invtsc": true, + "vmx-monitor-exit": true, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": true, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": true, + "waitpkg": false, + "cldemote": false, + "vmx-ept": true, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 94, + "movbe": true, + "nrip-save": false, + "ssse3": true, + "sse4a": false, + "vmx-pause-exit": true, + "invpcid": true, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 3, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": true, + "la57": false, + "vmx-invept": true, + "osvw": false, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": true, + "vmx-eptad": true, + "spec-ctrl": true, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "vmx-rdrand-exit": true, + "lwp": false, + "amd-ssbd": false, + "xop": false, + "ibpb": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": true, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": true, + "vmx-ept-1gb": true, + "ht": false, + "vmx-io-exit": true, + "nx": true, + "pclmulqdq": true, + "mmxext": false, + "popcnt": true, + "vaes": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": true, + "lm": true, + "vmx-exit-save-preemption-timer": true, + "vmx-entry-load-pat": true, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": true, + "umip": true, + "vmx-store-lma": true, + "vmx-movdr-exit": true, + "pse": true, + "avx2": true, + "sep": true, + "virt-ssbd": false, + "vmx-cr3-load-noexit": true, + "nodeid-msr": false, + "md-clear": true, + "misalignsse": false, + "split-lock-detect": false, + "min-xlevel": 2147483656, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "amd-stibp": false, + "vmx-preemption-timer": true, + "clflushopt": true, + "vmx-vnmi-pending": true, + "monitor": false, + "vmx-vintr-pending": true, + "avx512er": false, + "pmm-en": false, + "pcid": true, + "taa-no": false, + "arch-capabilities": true, + "vmx-secondary-ctls": true, + "vmx-xsaves": true, + "clzero": false, + "3dnow": false, + "erms": true, + "vmx-entry-ia32e-mode": true, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": true, + "fxsr-opt": false, + "xstore": false, + "rtm": true, + "kvm-hint-dedicated": false, + "lmce": true, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": true, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": false, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": true, + "vmx-mtf": true, + "vmx-entry-load-efer": true, + "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "sha-ni": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": true, + "xstore-en": false + } + } + }, + "id": "libvirt-49" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_5.1.0.x86_64.replies index 51e93819b0..d66583fa92 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies @@ -26601,6 +26601,329 @@ "id": "libvirt-49" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-50" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": false, + "xsavec": true, + "intel-pt": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "vmx-vmwrite-vmexit-fields": false, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "vmx-ept": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "vmx-pause-exit": false, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "vmx-rdrand-exit": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483679, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-50" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_5.2.0.aarch64.replies index fc92caae54..8c78533719 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies @@ -24366,6 +24366,53 @@ "id": "libvirt-44" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-45" +} + +{ + "return": { + "model": { + "name": "host", + "props": { + "sve768": false, + "sve128": false, + "sve1024": false, + "sve1280": false, + "sve896": false, + "sve256": false, + "sve1536": false, + "sve1792": false, + "sve384": false, + "sve": false, + "sve2048": false, + "kvm-no-adjvtime": false, + "sve512": false, + "aarch64": true, + "pmu": true, + "sve1920": false, + "sve1152": false, + "kvm-steal-time": false, + "sve640": false, + "sve1408": false, + "sve1664": false + } + } + }, + "id": "libvirt-45" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_5.2.0.x86_64.replies index 7e96c37f80..f224bd2fee 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies @@ -27391,6 +27391,330 @@ "id": "libvirt-49" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-50" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": false, + "xsavec": true, + "intel-pt": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "vmx-vmwrite-vmexit-fields": false, + "kvm-asyncpf-int": true, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "vmx-ept": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "vmx-pause-exit": false, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "vmx-rdrand-exit": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483679, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-50" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_6.0.0.aarch64.replies index 277180fa89..ed04553f29 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies @@ -26323,6 +26323,53 @@ "id": "libvirt-44" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-45" +} + +{ + "return": { + "model": { + "name": "host", + "props": { + "sve768": false, + "sve128": false, + "sve1024": false, + "sve1280": false, + "sve896": false, + "sve256": false, + "sve1536": false, + "sve1792": false, + "sve384": false, + "sve": false, + "sve2048": false, + "kvm-no-adjvtime": false, + "sve512": false, + "aarch64": true, + "pmu": true, + "sve1920": false, + "sve1152": false, + "kvm-steal-time": true, + "sve640": false, + "sve1408": false, + "sve1664": false + } + } + }, + "id": "libvirt-45" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.0.0.x86_64.replies index bccf12118a..d815a91f4c 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies @@ -29316,6 +29316,342 @@ "id": "libvirt-49" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-50" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": false, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": false, + "bus-lock-detect": false, + "xsavec": true, + "intel-pt": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "intel-pt-lip": false, + "vmx-vmwrite-vmexit-fields": false, + "kvm-asyncpf-int": true, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "avx512-fp16": false, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "pks": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "vmx-ept": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "kvm-msi-ext-dest-id": false, + "vmx-pause-exit": false, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "v-vmsave-vmload": false, + "vmx-rdrand-exit": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "ibrs": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "avic": false, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483679, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-entry-load-pkrs": false, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vgif": false, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "vmx-exit-load-pkrs": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-50" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.1.0.x86_64.replies index b7f1337edd..e55adfbe66 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies @@ -29797,6 +29797,344 @@ "id": "libvirt-49" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-50" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": true, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": false, + "bus-lock-detect": false, + "xsavec": true, + "intel-pt": false, + "vmx-tsc-scaling": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "intel-pt-lip": false, + "vmx-vmwrite-vmexit-fields": false, + "kvm-asyncpf-int": true, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "ds": false, + "fxsr": true, + "avx512-fp16": false, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "pks": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "avx-vnni": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "vmx-ept": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "kvm-msi-ext-dest-id": false, + "vmx-pause-exit": false, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "v-vmsave-vmload": false, + "vmx-rdrand-exit": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "ibrs": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "avic": false, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483679, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-entry-load-pkrs": false, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vgif": false, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "vmx-exit-load-pkrs": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-50" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_6.2.0.aarch64.replies index 61118722a3..20d176e4b7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies @@ -27411,6 +27411,53 @@ "id": "libvirt-45" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-46" +} + +{ + "return": { + "model": { + "name": "host", + "props": { + "sve768": false, + "sve128": false, + "sve1024": false, + "sve1280": false, + "sve896": false, + "sve256": false, + "sve1536": false, + "sve1792": false, + "sve384": false, + "sve": false, + "sve2048": false, + "kvm-no-adjvtime": false, + "sve512": false, + "aarch64": true, + "pmu": true, + "sve1920": false, + "sve1152": false, + "kvm-steal-time": true, + "sve640": false, + "sve1408": false, + "sve1664": false + } + } + }, + "id": "libvirt-46" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.2.0.x86_64.replies index fb32cb7a03..d7da5068b0 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies @@ -33123,6 +33123,354 @@ "id": "libvirt-50" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-51" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": true, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": false, + "bus-lock-detect": false, + "xsavec": true, + "intel-pt": false, + "vmx-tsc-scaling": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "intel-pt-lip": false, + "vmx-vmwrite-vmexit-fields": false, + "kvm-asyncpf-int": true, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "sgx": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "sgx-exinfo": false, + "ds": false, + "fxsr": true, + "avx512-fp16": false, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "sgx1": false, + "sgx2": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "pks": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "avx-vnni": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "sgxlc": false, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "sgx-tokenkey": false, + "vmx-ept": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "kvm-msi-ext-dest-id": false, + "vmx-pause-exit": false, + "invpcid": false, + "sgx-debug": false, + "pdpe1gb": true, + "sgx-mode64": false, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "sgx-kss": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "v-vmsave-vmload": false, + "vmx-rdrand-exit": false, + "sgx-provisionkey": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "ibrs": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "avic": false, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483679, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": false, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-entry-load-pkrs": false, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vgif": false, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "vmx-exit-load-pkrs": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-51" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_7.0.0.aarch64.replies index 6626778f0f..b330e842c2 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies @@ -31164,6 +31164,54 @@ "id": "libvirt-46" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-47" +} + +{ + "return": { + "model": { + "name": "host", + "props": { + "sve768": false, + "sve128": false, + "sve1024": false, + "sve1280": false, + "sve896": false, + "sve256": false, + "sve1536": false, + "sve1792": false, + "sve384": false, + "sve": false, + "sve2048": false, + "pauth": false, + "kvm-no-adjvtime": false, + "sve512": false, + "aarch64": true, + "pmu": true, + "sve1920": false, + "sve1152": false, + "kvm-steal-time": true, + "sve640": false, + "sve1408": false, + "sve1664": false + } + } + }, + "id": "libvirt-47" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.0.0.x86_64.replies index a331006289..a4b1a8490f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies @@ -33754,6 +33754,358 @@ "id": "libvirt-50" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-51" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": true, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": false, + "bus-lock-detect": false, + "xsavec": true, + "intel-pt": false, + "vmx-tsc-scaling": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "intel-pt-lip": false, + "vmx-vmwrite-vmexit-fields": false, + "kvm-asyncpf-int": true, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "sgx": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "sgx-exinfo": false, + "ds": false, + "fxsr": true, + "avx512-fp16": false, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "sgx1": false, + "sgx2": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "amx-tile": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "pks": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": false, + "hle": false, + "avx-vnni": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "sgxlc": false, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": false, + "amx-int8": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "sgx-tokenkey": false, + "vmx-ept": false, + "xfd": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "kvm-msi-ext-dest-id": false, + "vmx-pause-exit": false, + "invpcid": false, + "sgx-debug": false, + "pdpe1gb": true, + "sgx-mode64": false, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "sgx-kss": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "v-vmsave-vmload": false, + "vmx-rdrand-exit": false, + "sgx-provisionkey": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "ibrs": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "avic": false, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483679, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": true, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-entry-load-pkrs": false, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vgif": false, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "amx-bf16": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "vmx-exit-load-pkrs": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-51" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.1.0.x86_64.replies index 9eb851694f..1726cbc5f3 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies @@ -34436,6 +34436,359 @@ "id": "libvirt-50" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-51" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": true, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": false, + "bus-lock-detect": false, + "xsavec": true, + "intel-pt": false, + "vmx-tsc-scaling": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "intel-pt-lip": false, + "vmx-vmwrite-vmexit-fields": false, + "kvm-asyncpf-int": true, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "sgx": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "sgx-exinfo": false, + "ds": false, + "fxsr": true, + "avx512-fp16": false, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "arch-lbr": false, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "sgx1": false, + "sgx2": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "amx-tile": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "pks": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": true, + "hle": false, + "avx-vnni": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "sgxlc": false, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": false, + "vmx-invpcid-exit": false, + "amx-int8": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "sgx-tokenkey": false, + "vmx-ept": false, + "xfd": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "kvm-msi-ext-dest-id": false, + "vmx-pause-exit": false, + "invpcid": false, + "sgx-debug": false, + "pdpe1gb": true, + "sgx-mode64": false, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "sgx-kss": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "v-vmsave-vmload": false, + "vmx-rdrand-exit": false, + "sgx-provisionkey": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "ibrs": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "avic": false, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483681, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": true, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-entry-load-pkrs": false, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vgif": false, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "amx-bf16": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "vmx-exit-load-pkrs": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-51" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.2.0.x86_64.replies index 18f70a5a3f..6a465f6856 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies @@ -35451,6 +35451,359 @@ "id": "libvirt-50" } =20 +{ + "execute": "query-cpu-model-expansion", + "arguments": { + "type": "full", + "model": { + "name": "host", + "props": { + "migratable": false, + "hv-passthrough": true + } + } + }, + "id": "libvirt-51" +} + +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "svme-addr-chk": true, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "rdpid": true, + "arat": true, + "vmx-page-walk-4": false, + "vmx-page-walk-5": false, + "gfni": false, + "ibrs-all": false, + "vmx-desc-exit": false, + "pause-filter": true, + "bus-lock-detect": false, + "xsavec": true, + "intel-pt": false, + "vmx-tsc-scaling": false, + "vmx-cr8-store-exit": false, + "vmx-rdseed-exit": false, + "vmx-eptp-switching": false, + "kvm-asyncpf": true, + "perfctr-core": true, + "mpx": false, + "pbe": false, + "avx512cd": false, + "decodeassists": false, + "vmx-exit-load-efer": false, + "vmx-exit-clear-bndcfgs": false, + "sse4.1": true, + "family": 23, + "intel-pt-lip": false, + "vmx-vmwrite-vmexit-fields": false, + "kvm-asyncpf-int": true, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "wbnoinvd": true, + "avx512f": false, + "msr": true, + "mce": true, + "mca": true, + "xcrypt": false, + "sgx": false, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "sgx-exinfo": false, + "ds": false, + "fxsr": true, + "avx512-fp16": false, + "avx512-bf16": false, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "arch-lbr": false, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "xtpr": false, + "tsx-ctrl": false, + "vmx-ple": false, + "avx512vl": false, + "avx512-vpopcntdq": false, + "phe": false, + "extapic": false, + "3dnowprefetch": true, + "vmx-vmfunc": false, + "vmx-activity-shutdown": false, + "sgx1": false, + "sgx2": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "vmx-pml": false, + "vmx-nmi-exit": false, + "amx-tile": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vendor": "AuthenticAMD", + "vmx-unrestricted-guest": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "pks": false, + "smx": false, + "cmp-legacy": true, + "avx512-4fmaps": false, + "vmcb-clean": true, + "hle": false, + "avx-vnni": false, + "3dnowext": false, + "amd-no-ssb": false, + "npt": true, + "sgxlc": false, + "rdctl-no": true, + "vmx-invvpid": false, + "clwb": true, + "lbrv": true, + "adx": true, + "ss": false, + "pni": true, + "tsx-ldtrk": false, + "svm-lock": false, + "smep": true, + "smap": true, + "pfthreshold": true, + "vmx-invpcid-exit": false, + "amx-int8": false, + "x2apic": true, + "avx512vbmi": false, + "avx512vnni": false, + "vmx-apicv-x2apic": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "vmx-invvpid-all-context": false, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "phe-en": false, + "vmx-tsc-offset": false, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "avx512dq": false, + "svm": true, + "invtsc": true, + "vmx-monitor-exit": false, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "sgx-tokenkey": false, + "vmx-ept": false, + "xfd": false, + "kvm-mmu": false, + "sse4.2": true, + "pge": true, + "avx512bitalg": false, + "pdcm": false, + "vmx-entry-load-bndcfgs": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip-save": true, + "ssse3": true, + "sse4a": true, + "kvm-msi-ext-dest-id": false, + "vmx-pause-exit": false, + "invpcid": false, + "sgx-debug": false, + "pdpe1gb": true, + "sgx-mode64": false, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ibs": false, + "fma4": false, + "vmx-exit-nosave-debugctl": false, + "sgx-kss": false, + "la57": false, + "vmx-invept": false, + "osvw": true, + "apic": true, + "pmm": false, + "vmx-entry-noload-debugctl": false, + "vmx-eptad": false, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "tsc-adjust": true, + "kvm-steal-time": true, + "avx512-vp2intersect": false, + "kvmclock": true, + "vmx-zero-len-inject": false, + "pschange-mc-no": true, + "v-vmsave-vmload": true, + "vmx-rdrand-exit": false, + "sgx-provisionkey": false, + "lwp": false, + "amd-ssbd": true, + "xop": false, + "ibpb": true, + "ibrs": false, + "avx": true, + "core-capability": false, + "vmx-invept-single-context": false, + "movdiri": false, + "acpi": false, + "avx512bw": false, + "ace2": false, + "fsgsbase": true, + "vmx-ept-2mb": false, + "vmx-ept-1gb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "serialize": false, + "movdir64b": false, + "xsaves": true, + "vmx-shadow-vmcs": false, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "fsrm": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "umip": true, + "vmx-store-lma": false, + "vmx-movdr-exit": false, + "pse": true, + "avx2": true, + "avic": false, + "sep": true, + "virt-ssbd": true, + "vmx-cr3-load-noexit": false, + "nodeid-msr": false, + "md-clear": false, + "misalignsse": true, + "split-lock-detect": false, + "min-xlevel": 2147483681, + "bmi1": true, + "bmi2": true, + "kvm-pv-unhalt": true, + "tsc-scale": true, + "topoext": false, + "amd-stibp": true, + "vmx-preemption-timer": false, + "clflushopt": true, + "vmx-entry-load-pkrs": false, + "vmx-vnmi-pending": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "full-width-write": false, + "pmm-en": false, + "pcid": false, + "taa-no": false, + "arch-capabilities": true, + "vgif": true, + "vmx-secondary-ctls": false, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "vpclmulqdq": false, + "vmx-ins-outs": false, + "fxsr-opt": true, + "xstore": false, + "rtm": false, + "kvm-hint-dedicated": false, + "amx-bf16": false, + "lmce": false, + "perfctr-nb": false, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "wdt": false, + "vmx-rdpmc-exit": false, + "vmx-mtf": false, + "vmx-entry-load-efer": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "vmx-exit-load-pkrs": false, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "libvirt-51" +} + { "execute": "qmp_capabilities", "id": "libvirt-1" --=20 2.38.2 From nobody Fri May 17 11:05:20 2024 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=1671714120; cv=none; d=zohomail.com; s=zohoarc; b=iD175yLfDyPe41yVAtiz/2opCthXlYr8eh+9J9uhcG+fGQM72fVyl3agJADUIjgg9VZVubjqN93mZDQNW6vMipKV/PZOj9WSvY9RdYqkfs2gM1oOC5eeBC5v5LvW8+EXQPox5rSx5C8S2lmLA/MmJasevNp1+ojL/6FDbb8DjYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714120; 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=emJsmyPUWpdq/pwYFzA7uiv9xgkyo+FMVCq24C4xIdw=; b=A9qb2ZMESD13Zs0f7jWhANVM/pFPxpGhJkVLJzKyFrhave6Nmpn6ZvxyMVdN03ZIVamrcxXr8TwwbfenlYiVG1QlCtTQIoLYx9Heo0a944sfXhpQ4U++5KemcHIxJ6Q9YBkN7FRjRZDqB6o1XW0nlcLEkcNz5XTRfzVXZrYNfq0= 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 1671714120395815.5691718597384; Thu, 22 Dec 2022 05:02:00 -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-270-5_pe5RAYOv29caoi_nR4jA-1; Thu, 22 Dec 2022 08:01:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D8FE857A9F; Thu, 22 Dec 2022 13:01:51 +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 77423400D79E; Thu, 22 Dec 2022 13:01:51 +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 5F49419465B2; Thu, 22 Dec 2022 13:01:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1882919465B3 for ; Thu, 22 Dec 2022 13:01:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0CEAA40C2064; Thu, 22 Dec 2022 13:01:50 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A98F440C2005 for ; Thu, 22 Dec 2022 13:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671714119; 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=emJsmyPUWpdq/pwYFzA7uiv9xgkyo+FMVCq24C4xIdw=; b=RoR6sr+mgEbQibtgzQFJkoxW1mkI6iyYJjb8wkWilMj3DzAZWWOTzw87bxJ8wRNotGm7BN fYjtd99vtQycGrDzIvFZDo2i17HHAzdj+u3aMMaZIKmhYW9zl6OOviU0eaH6V9hGf0uO4V cCASoYt+dMltp8GlgNfD13ptY8VvCPI= X-MC-Unique: 5_pe5RAYOv29caoi_nR4jA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 6/7] domain_capabilities: Expose Hyper-V Enlightenments Date: Thu, 22 Dec 2022 14:01:42 +0100 Message-Id: <2046dc14f07fe2960d634379994ed483128d9467.1671714076.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.2 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: 1671714122048100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Michal Privoznik --- docs/formatdomaincaps.rst | 15 +++++++++++++++ src/conf/domain_capabilities.c | 12 ++++++++++++ src/conf/domain_capabilities.h | 8 ++++++++ src/conf/schemas/domaincaps.rng | 10 ++++++++++ 4 files changed, 45 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 532fea0f60..dc227e9d02 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -624,6 +624,12 @@ capabilities. All features occur as children of the ma= in ``features`` element.
+ + + relaxed + vapic + + =20 @@ -733,3 +739,12 @@ document store. In order to use SGX with libvirt have = a look at `SGX in domain X =20 ``sections`` The sections of the SGX enclave page cache (called EPC). + + +Hyper-V Enlightenments +^^^^^^^^^^^^^^^^^^^^^^ + +Report which features improving behavior of guests running Microsoft Windo= ws +are supported. The ``features`` enum corresponds to the ```` elem= ent +(well, its children) as documented in `Hypervisor features +`__ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 4e412c0fd8..88bb8e2872 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -684,6 +684,17 @@ virDomainCapsFeatureSGXFormat(virBuffer *buf, virBufferAddLit(buf, "\n"); } =20 +static void +virDomainCapsFeatureHypervFormat(virBuffer *buf, + const virDomainCapsFeatureHyperv *hyperv) +{ + FORMAT_PROLOGUE(hyperv); + + ENUM_PROCESS(hyperv, features, virDomainHypervTypeToString); + + FORMAT_EPILOGUE(hyperv); +} + static void virDomainCapsFormatFeatures(const virDomainCaps *caps, virBuffer *buf) @@ -704,6 +715,7 @@ virDomainCapsFormatFeatures(const virDomainCaps *caps, =20 virDomainCapsFeatureSEVFormat(&childBuf, caps->sev); virDomainCapsFeatureSGXFormat(&childBuf, caps->sgx); + virDomainCapsFeatureHypervFormat(&childBuf, &caps->hyperv); =20 virXMLFormatElement(buf, "features", NULL, &childBuf); } diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 1d504a3506..5ed29c7444 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -158,6 +158,13 @@ struct _virDomainCapsFeatureGIC { virDomainCapsEnum version; /* Info about virGICVersion */ }; =20 +STATIC_ASSERT_ENUM(VIR_DOMAIN_HYPERV_LAST); +typedef struct _virDomainCapsFeatureHyperv virDomainCapsFeatureHyperv; +struct _virDomainCapsFeatureHyperv { + virTristateBool supported; + virDomainCapsEnum features; /* Info about supported virDomainHyperv fe= atures */ +}; + typedef enum { VIR_DOMCAPS_CPU_USABLE_UNKNOWN, VIR_DOMCAPS_CPU_USABLE_YES, @@ -263,6 +270,7 @@ struct _virDomainCaps { virDomainCapsFeatureGIC gic; virSEVCapability *sev; virSGXCapability *sgx; + virDomainCapsFeatureHyperv hyperv; /* add new domain features here */ =20 virTristateBool features[VIR_DOMAIN_CAPS_FEATURE_LAST]; diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.= rng index b6408bca88..4b96e89dfa 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -296,6 +296,9 @@ + + + =20 @@ -396,6 +399,13 @@ =20 + + + + + + + --=20 2.38.2 From nobody Fri May 17 11:05:20 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=1671714184; cv=none; d=zohomail.com; s=zohoarc; b=CsIK1j69VRY6kbxup/jMrRJx7JbmHknhGA+oKcnJNw9AnXRBz3P+z5Wn/XbqZxkCqv0bRr0CSTtY0jKuzSpRvj0Ucujzc2sDdP2p69iHL56Mz85oxzvKCdSQYL6z7iS53r5TQPIpFYKaxr6CkmBXqaL9j4/P20kTs6SBk/0kUeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671714184; 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=ePECejN5ama8vW31B4JvHeWXRRPy1Tj0lOJNoKmVJ40=; b=k06nzAjGwU99QReJTeUe83ZBRSSpvQdjb8ABnsvlVMWzHzZ4QkwjG34NCclWreTSgID8xHeaxwUWPn7NaF7oPYGxl9/eAzXSumX0jr3z0WrADerICRz91Ws92o+ikoy1LQhEcSxByumb/LBH1nM5QPs2HfjNt6eHc5wzfvmfHAg= 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 1671714184452752.7050663689778; Thu, 22 Dec 2022 05:03:04 -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-18-TS7V5BiKMNupGHQonHsl9Q-1; Thu, 22 Dec 2022 08:01:56 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C3A828F6E88; Thu, 22 Dec 2022 13:01:51 +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 A57BAC1602C; Thu, 22 Dec 2022 13:01:51 +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 941C41946A6C; Thu, 22 Dec 2022 13:01:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B0BF919465A8 for ; Thu, 22 Dec 2022 13:01:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A111E40C2064; Thu, 22 Dec 2022 13:01:50 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4868C40C200C for ; Thu, 22 Dec 2022 13:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671714183; 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=ePECejN5ama8vW31B4JvHeWXRRPy1Tj0lOJNoKmVJ40=; b=XGFvjMoWJkWXaEtCu+1+hgyz+TksT5n3MetyQdPsXlUsaWiWb/Af7X0qDtyeKODRgKoxZx vNfzrfTe8qjPQ6fRlXQGW0DLxJxmjGL+3JHKRi7ojYu0MUXj4ASSht/82MJ7aWdVFRz6R+ oAyyrANaKCjsBFXcvHAEgPFKR3RIyTw= X-MC-Unique: TS7V5BiKMNupGHQonHsl9Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v1 7/7] qemu_capabilities: Report Hyper-V Enlightenments in domcapabilities Date: Thu, 22 Dec 2022 14:01:43 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.8 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: 1671714184715100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Inside of qemuCaps (for the corresponding accelerator) we have full host CPU expansion stored, among with supported Hyper-V Enlightenments. To report them in the domain capabilities, we just have to pick those starting with "hv-" and see if we know them. You may notice that neither of our domaincapsdata test shows any enlightenment. This is because the test works by parsing corresponding qemucapabilitiesdata/caps_*.xml file and none of these store the full host CPU expansion (hostCPU.fullQEMU) because that is runtime piece of information and not formatted into virQEMUCaps XML. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1717611 Signed-off-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 57 +++++++++++++++++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + .../qemu_6.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + .../qemu_7.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 + 53 files changed, 109 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fd09d52b6d..4fac108982 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6674,6 +6674,62 @@ virQEMUCapsFillDomainFeatureSGXCaps(virQEMUCaps *qem= uCaps, virQEMUCapsSGXInfoCopy(&domCaps->sgx, qemuCaps->sgxCapabilities); } =20 + +static void +virQEMUCapsFillDomainFeatureHypervCaps(virQEMUCaps *qemuCaps, + virDomainCaps *domCaps) +{ + virDomainCapsFeatureHyperv *hvcaps =3D &domCaps->hyperv; + qemuMonitorCPUModelInfo *fullQEMU =3D NULL; + size_t i; + + fullQEMU =3D virQEMUCapsGetAccel(qemuCaps, domCaps->virttype)->hostCPU= .fullQEMU; + + if (!fullQEMU) { + hvcaps->supported =3D VIR_TRISTATE_BOOL_NO; + return; + } + + hvcaps->supported =3D VIR_TRISTATE_BOOL_YES; + hvcaps->features.report =3D true; + + for (i =3D 0; i nprops; i++) { + qemuMonitorCPUProperty prop =3D fullQEMU->props[i]; + const char *name; + int hvprop; + + if (!(name =3D STRSKIP(prop.name, "hv-"))) + continue; + + hvprop =3D virDomainHypervTypeFromString(name); + + if (hvprop < 0) { + /* Some names are different. For instance QEMU reports hv-vend= or-id + * but we have it as vendor_id (because of XML). Replace hyphe= ns + * with underscores and try again. */ + g_autofree char *underscoreName =3D NULL; + + underscoreName =3D virStringReplace(name, "-", "_"); + + hvprop =3D virDomainHypervTypeFromString(underscoreName); + if (hvprop < 0) { + VIR_DEBUG("Not yet implement Hyper-V enlightenment: %s", + prop.name); + continue; + } + } + + if ((prop.type =3D=3D QEMU_MONITOR_CPU_PROPERTY_BOOLEAN && + prop.value.boolean) || + (prop.type =3D=3D QEMU_MONITOR_CPU_PROPERTY_NUMBER && + prop.value.number > 0) || + (prop.type =3D=3D QEMU_MONITOR_CPU_PROPERTY_STRING && + prop.value.string)) + VIR_DOMAIN_CAPS_ENUM_SET(hvcaps->features, hvprop); + } +} + + int virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virArch hostarch, @@ -6730,6 +6786,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureSGXCaps(qemuCaps, domCaps); + virQEMUCapsFillDomainFeatureHypervCaps(qemuCaps, domCaps); =20 return 0; } diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-q35.x86_64.xml index d0bf0bdc7b..49550e799f 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -238,5 +238,6 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-tcg.x86_64.xml index 6a3818fb4e..a5a1eb71fb 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -253,5 +253,6 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_4.2.0-virt.aarch64.xml index 02aca3e448..e001128bf5 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -185,5 +185,6 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincaps= data/qemu_4.2.0.aarch64.xml index 676e1b0739..5aa9520fab 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -179,5 +179,6 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_4.2.0.ppc64.xml index bcc415d7de..2017a0cf44 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -152,5 +152,6 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_4.2.0.s390x.xml index 4f176e2d37..e9c082244b 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -259,5 +259,6 @@ + diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_4.2.0.x86_64.xml index 36a4081764..c67217d4ac 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -238,5 +238,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-q35.x86_64.xml index 05884cdb86..bf8c6a5a54 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -240,5 +240,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-tcg.x86_64.xml index c53b84c140..ebab6a15f3 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -255,5 +255,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.0.0-virt.aarch64.xml index e74a3d9f5f..071187cfaf 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -198,5 +198,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincaps= data/qemu_5.0.0.aarch64.xml index 605575c793..05ba8f5a83 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -192,5 +192,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.0.0.ppc64.xml index a5b718618b..35d6733d23 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -159,5 +159,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.0.0.x86_64.xml index fd1f42b555..c3ac6668af 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -240,5 +240,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-q35.x86_64.xml index a04c3e7130..f8eeb3c097 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -241,5 +241,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-tcg.x86_64.xml index a7b2ff8d7d..5a6aee6bda 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -255,5 +255,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsda= ta/qemu_5.1.0.sparc.xml index cde31462bc..f3ad4d43cb 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -126,5 +126,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.1.0.x86_64.xml index 45b7dcf6e4..6cf741e7ea 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -241,5 +241,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-q35.x86_64.xml index 61cfa7d449..bf642e4956 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -241,5 +241,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-tcg.x86_64.xml index caced52187..8d1702b5e3 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -255,5 +255,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.2.0-virt.aarch64.xml index f19ad32693..43febfb61a 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -198,5 +198,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincaps= data/qemu_5.2.0.aarch64.xml index 605575c793..05ba8f5a83 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -192,5 +192,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.2.0.ppc64.xml index 8ae7487c1e..87dd5cd28e 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -159,5 +159,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_5.2.0.s390x.xml index 760f514d7b..7e7f58acd6 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -261,5 +261,6 @@ + diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.2.0.x86_64.xml index 67f8b0fd83..61969bcffd 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -241,5 +241,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-q35.x86_64.xml index 08585e6cb0..c9c5506536 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -248,5 +248,6 @@ 450 + diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-tcg.x86_64.xml index 7536a42ad5..eb42eec406 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -263,5 +263,6 @@ 450 + diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.0.0-virt.aarch64.xml index 1235dd0ab7..def36192f5 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -200,5 +200,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincaps= data/qemu_6.0.0.aarch64.xml index 461e34f1d6..7177d16fa4 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -194,5 +194,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsda= ta/qemu_6.0.0.s390x.xml index b1968668db..b977b494d4 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -262,5 +262,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.0.0.x86_64.xml index 632f7c21d1..a5333e5293 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -248,5 +248,6 @@ 450 + diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-q35.x86_64.xml index 35d1014626..b0480cf625 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -244,5 +244,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-tcg.x86_64.xml index 9d56f2dda7..5e89b5d17b 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -258,5 +258,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.1.0.x86_64.xml index 591ca12d72..4a3cdbe758 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -244,5 +244,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-q35.x86_64.xml index 7558e78423..064d0014c6 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -244,5 +244,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-tcg.x86_64.xml index c667b944da..194712f95c 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -260,5 +260,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.2.0-virt.aarch64.xml index 2c9ba98a0a..1da26e9c36 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -207,5 +207,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincaps= data/qemu_6.2.0.aarch64.xml index 9b546f59bc..2878c9d42e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -201,5 +201,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_6.2.0.ppc64.xml index fd7c9d8d5a..a2d6428c2f 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -158,5 +158,6 @@ + diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.2.0.x86_64.xml index a20d3722fd..1da12ba5f1 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -244,5 +244,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-q35.x86_64.xml index ac9d384bb3..7e24baf97f 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -254,5 +254,6 @@
+ diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-tcg.x86_64.xml index 2419875474..1fe6b606fa 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -270,5 +270,6 @@
+ diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_7.0.0-virt.aarch64.xml index f4eb8a728b..e3f1b2d2c0 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -206,5 +206,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincaps= data/qemu_7.0.0.aarch64.xml index 053bec369b..6cae496a8e 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -200,5 +200,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.0.0.ppc64.xml index 9c09174d77..f957e8167d 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -163,5 +163,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.0.0.x86_64.xml index 886e14ea49..f8b9526831 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -254,5 +254,6 @@
+ diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-q35.x86_64.xml index 6b5e8a6820..77e015659d 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -244,5 +244,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-tcg.x86_64.xml index e44804c21c..56ac94c8d7 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -259,5 +259,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.1.0.ppc64.xml index 15cf6a9cf8..3ea6fa0943 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -156,5 +156,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.1.0.x86_64.xml index d4069dd6f0..dc5f9d7148 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -244,5 +244,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.2.0-q35.x86_64.xml index e6997ccbc6..d58fafde51 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -249,5 +249,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.2.0-tcg.x86_64.xml index b9bf0b6a04..e5428beea1 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -248,5 +248,6 @@ + diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.2.0.x86_64.xml index 67ecdc0b12..fa1cb45d65 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -249,5 +249,6 @@ + --=20 2.38.2