From nobody Sat Feb 7 09:59:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1679499652; cv=none; d=zohomail.com; s=zohoarc; b=PGdXpzaMXiMwqKazufUd04mHL5MPntL9PCMl6Q6skZI9liYfjvSC9YB5TafRcL8vKfsQr2G6hSKSputtAZEZC8n8Rn5z32tJuPGj6/zwq4mV7C8Jb0188xxpvOT80vb9B1xU/sNJTTCJa+TZYaaDoVkZcqtND4mGXmcNByJS3ZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679499652; h=Content-Type:Content-Transfer-Encoding:Cc: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=n2M4IXkIO8SjotoyTxhic72rnk70o4jvTozzz8IR0ws=; b=YPgYtjL+NEQjDuARq8MskvSGN530kWeK8dLb7Riyyuw9SUpELWMMbcLGl4zsKmsUl6Kt8xD+a1C1KSbojAhOu8slf8jK5TDZI3P8u+pn+3I3L+kqcqaZrOHcSpw6WnEVXu88H1/o+OikcvxSRnb54G7y+Dtxhguj6Y3zmbJ2yBA= 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=fail header.from= (p=reject 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 1679499652389248.4014090271935; Wed, 22 Mar 2023 08:40:52 -0700 (PDT) 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-669-5QwsjMrcMSKU05SKdbPqlw-1; Wed, 22 Mar 2023 11:40:49 -0400 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 8734C80280D; Wed, 22 Mar 2023 15:40:45 +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 7422342C827; Wed, 22 Mar 2023 15:40:45 +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 45F831946589; Wed, 22 Mar 2023 15:40:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2DF271946587 for ; Wed, 22 Mar 2023 15:39:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 014B51410F1F; Wed, 22 Mar 2023 15:39:53 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EDCA11410F1E for ; Wed, 22 Mar 2023 15:39:52 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D196F101A551 for ; Wed, 22 Mar 2023 15:39:52 +0000 (UTC) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-168-Tzbd3wzyPd-1odImySDXWw-1; Wed, 22 Mar 2023 11:39:50 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32MEfIHK020737 for ; Wed, 22 Mar 2023 15:39:50 GMT Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pg1xjn3e4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Mar 2023 15:39:50 +0000 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32MEVxCF010269 for ; Wed, 22 Mar 2023 15:39:49 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([9.208.129.116]) by ppma03dal.us.ibm.com (PPS) with ESMTPS id 3pd4x7f6qa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Mar 2023 15:39:49 +0000 Received: from smtpav04.wdc07v.mail.ibm.com (smtpav04.wdc07v.mail.ibm.com [10.39.53.231]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32MFdloQ59703718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Mar 2023 15:39:47 GMT Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 57E2658050; Wed, 22 Mar 2023 15:39:47 +0000 (GMT) Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0305A58045; Wed, 22 Mar 2023 15:39:47 +0000 (GMT) Received: from dhcp-9-57-191-246.pok.ibm.com (unknown [9.57.191.246]) by smtpav04.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 22 Mar 2023 15:39:46 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679499651; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=n2M4IXkIO8SjotoyTxhic72rnk70o4jvTozzz8IR0ws=; b=a+NCKVGxsJ59tGGTGsCwUGwAHWg7bm6vSJq4nUr8XW6z2Fapoj4EvlQRimXCUi0v60zRLb +irlWzfTWMGwCgclPMcezmgnDdkKJdkzLeQn+6z7Oy0HYPD9LReyl7mpAN/jW8/dzKyRyO iQtx14gK5OzeFRXDg5p4/70iq2x+O1g= X-MC-Unique: 5QwsjMrcMSKU05SKdbPqlw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: Tzbd3wzyPd-1odImySDXWw-1 From: Collin Walling To: libvir-list@redhat.com Subject: [PATCH v1 4/4] qemu_driver: Implement qemuConnectGetHypervisorCPUNames Date: Wed, 22 Mar 2023 11:39:18 -0400 Message-Id: <20230322153918.96924-5-walling@linux.ibm.com> In-Reply-To: <20230322153918.96924-1-walling@linux.ibm.com> References: <20230322153918.96924-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: z7hUOfq_IVAFdq3_lsSHgOvVuC9Wxn5e X-Proofpoint-GUID: z7hUOfq_IVAFdq3_lsSHgOvVuC9Wxn5e X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-22_12,2023-03-22_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 priorityscore=1501 adultscore=0 mlxlogscore=593 clxscore=1015 malwarescore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303220106 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: , Cc: fiuczy@linux.ibm.com 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: 1679499653724100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This function is hooked into the virsh hypervisor-cpu-models command. The CPU models are read directly from the QEMU capabilities file, which contains a list of all models queried from the hypervisor. Signed-off-by: Collin Walling Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_driver.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 09ae893daf..e101da4d21 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12400,6 +12400,67 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr con= n, } =20 =20 +static char * +qemuConnectGetHypervisorCPUModelNames(virConnectPtr conn, + const char *emulator, + const char *archStr, + const char *machine, + const char *virttypeStr, + unsigned int flags) +{ + virQEMUDriver *driver =3D conn->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virDomainCapsCPUModels) cpuModels =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; + char *modelsstr =3D g_strdup(""); + virDomainVirtType virttype; + virArch arch; + size_t i; + + virCheckFlags(0, NULL); + + if (virConnectGetHypervisorCPUModelNamesEnsureACL(conn) < 0) + return NULL; + + qemuCaps =3D virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, + emulator, + archStr, + virttypeStr, + machine, + &arch, &virttype, NULL); + if (!qemuCaps) + return NULL; + + if (!(cpuModels =3D virQEMUCapsGetCPUModels(qemuCaps, virttype, NULL, = NULL)) || + cpuModels->nmodels =3D=3D 0) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("QEMU '%s' does not support any CPU models for " + "virttype '%s'"), + virQEMUCapsGetBinary(qemuCaps), + virDomainVirtTypeToString(virttype)); + return NULL; + } + + for (i =3D 0; i < cpuModels->nmodels; i++) { + const char *name =3D cpuModels->models[i].name; + char *oldstr =3D modelsstr; + /* + * These models are not architecture-specific, but rather + * generic QEMU models, so let's filter them out + */ + if (STREQ(name, "host") || + STREQ(name, "qemu") || + STREQ(name, "max")) + continue; + + modelsstr =3D g_strdup_printf("%s\n%s", name, modelsstr); + g_free(oldstr); + } + + return modelsstr; +} + + static int qemuDomainGetJobInfoMigrationStats(virDomainObj *vm, virDomainJobData *jobData) @@ -20814,6 +20875,7 @@ static virHypervisorDriver qemuHypervisorDriver =3D= { .domainSetLifecycleAction =3D qemuDomainSetLifecycleAction, /* 3.9.0 */ .connectCompareHypervisorCPU =3D qemuConnectCompareHypervisorCPU, /* 4= .4.0 */ .connectBaselineHypervisorCPU =3D qemuConnectBaselineHypervisorCPU, /*= 4.4.0 */ + .connectGetHypervisorCPUModelNames =3D qemuConnectGetHypervisorCPUMode= lNames, /* 9.2.0 */ .nodeGetSEVInfo =3D qemuNodeGetSEVInfo, /* 4.5.0 */ .domainGetLaunchSecurityInfo =3D qemuDomainGetLaunchSecurityInfo, /* 4= .5.0 */ .domainCheckpointCreateXML =3D qemuDomainCheckpointCreateXML, /* 5.6.0= */ --=20 2.39.0