From nobody Mon Sep 16 18:53:30 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=fail(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1694466604; cv=none; d=zohomail.com; s=zohoarc; b=FCBccakmk7TfGjpsxfm7WrfqkHYJ36+OpiRew3IaFsx5YZ3K0pX68zSkAMuOXMuqPtyrDJhjhWPkfKMRszLzKkitrr3+UnRoynTCAy/qsarBR4ParRZNhl2c8pdmHDnEg7lLSiGJQfqgMlb9tjBKdDRBGQQmytU9n1pr3xMvmik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694466604; 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=/VK7h8llSREEHu4ttjKKMsaL42G7uDC7c9dJmJ7oyTI=; b=buRdRRf0y6o4dnkmbQGL8ZPQkceRcW+ga0KdG4irQTSsEDNIfpvUVUA5/sAQkI7BV9gq8Aoa+dWBK7mg6pgGxqCbTLyLKX0tsOz0TuI+nQl5AmfC5YYHFx3yQ1d2LesJCLodrdG4Ct6mVjrgKV+yTV3OwS19xFquX3j683vhIhs= 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 1694466604154202.6722374644247; Mon, 11 Sep 2023 14:10:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.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-473--YgH1TDhOOOFJLZ7JT27TQ-1; Mon, 11 Sep 2023 17:09:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 4B2C72A5955D; Mon, 11 Sep 2023 21:09:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 337ED10F1BE7; Mon, 11 Sep 2023 21:09:24 +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 B61C81946A50; Mon, 11 Sep 2023 21:09:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E9AE019465A4 for ; Mon, 11 Sep 2023 21:09:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C9ECB2027045; Mon, 11 Sep 2023 21:09:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C18BE2026D68 for ; Mon, 11 Sep 2023 21:09:22 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-inbound-delivery-1.mimecast.com [207.211.31.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 8A43F3802B82 for ; Mon, 11 Sep 2023 21:09:22 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-271-lBDtErafOG6-PXa-irZUNA-1; Mon, 11 Sep 2023 17:09:20 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38BL7mRN017286 for ; Mon, 11 Sep 2023 21:09:19 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3t29dy9tar-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Sep 2023 21:09:18 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 38BJuYIj002724 for ; Mon, 11 Sep 2023 21:09:17 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3t14hknktq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Sep 2023 21:09:17 +0000 Received: from smtpav04.dal12v.mail.ibm.com (smtpav04.dal12v.mail.ibm.com [10.241.53.103]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 38BL9G7s4915882 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 Sep 2023 21:09:16 GMT Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 70D6358056; Mon, 11 Sep 2023 21:09:16 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 31D0158052; Mon, 11 Sep 2023 21:09:16 +0000 (GMT) Received: from li-d664314c-3171-11b2-a85c-fa8047ef35bd.ibm.com.com (unknown [9.67.49.93]) by smtpav04.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 11 Sep 2023 21:09:16 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694466603; 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=/VK7h8llSREEHu4ttjKKMsaL42G7uDC7c9dJmJ7oyTI=; b=AVch7wVHxLaL+M1xCGrLbtrcPmTFCQjNtm1fbqu0QMw5VuQHPLxixulnQcOdqhKZ3bVsoh CoXtp6H8o+5DaBFRtZBYpmfSqrcSRxc2SM+TmJIAtQBGCGbF6AgjpvUZNtaocQDBCeCHdB UTTdi/V5VgC+DprjbIBnK6wX9WbXFEQ= X-MC-Unique: -YgH1TDhOOOFJLZ7JT27TQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: lBDtErafOG6-PXa-irZUNA-1 From: Collin Walling To: libvir-list@redhat.com Subject: [PATCH v1 9/9] qemu_driver: expand baselined model to static_recommended for s390x Date: Mon, 11 Sep 2023 17:07:16 -0400 Message-ID: <20230911210716.75648-10-walling@linux.ibm.com> In-Reply-To: <20230911210716.75648-1-walling@linux.ibm.com> References: <20230911210716.75648-1-walling@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 644e6nikfW_iVcvq_KlIHaqcTcYcSnZC X-Proofpoint-ORIG-GUID: 644e6nikfW_iVcvq_KlIHaqcTcYcSnZC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-09-11_16,2023-09-05_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 spamscore=0 phishscore=0 mlxlogscore=576 mlxscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2309110194 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.4 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: Boris Fiuczynski Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linux.ibm.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694466643311100004 Content-Type: text/plain; charset="utf-8"; x-default="true" In order for the CPU model expansion command to consider any deprecated CPU features, s390x will need to use the special static recommended expansion type after baselining. Signed-off-by: Collin Walling Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1c61685489..c4428c066f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11687,7 +11687,8 @@ qemuConnectCPUModelBaseline(virQEMUCaps *qemuCaps, bool expand_features, virCPUDef **cpus, int ncpus, - virDomainCapsCPUModels *cpuModels) + virDomainCapsCPUModels *cpuModels, + virArch arch) { g_autoptr(qemuProcessQMP) proc =3D NULL; g_autoptr(virCPUDef) baseline =3D NULL; @@ -11739,6 +11740,9 @@ qemuConnectCPUModelBaseline(virQEMUCaps *qemuCaps, expansion_type =3D expand_features ? QEMU_MONITOR_CPU_MODEL_EXPANS= ION_FULL : QEMU_MONITOR_CPU_MODEL_EXPANSIO= N_STATIC; =20 + if (ARCH_IS_S390(arch) && expansion_type =3D=3D QEMU_MONITOR_CPU_M= ODEL_EXPANSION_STATIC) + expansion_type =3D QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_REC; + if (qemuMonitorGetCPUModelExpansion(proc->mon, expansion_type, baseline, true, false, false, &result) < 0) @@ -11827,7 +11831,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, if (!(cpu =3D qemuConnectCPUModelBaseline(qemuCaps, cfg->libDir, cfg->user, cfg->group, expand_features, cpus, ncp= us, - cpuModels))) + cpuModels, arch))) goto cleanup; } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, --=20 2.41.0