From nobody Thu Apr 25 19:27:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1490983390180933.8177118063392; Fri, 31 Mar 2017 11:03:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 758DD3DBEE; Fri, 31 Mar 2017 18:03:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F1B055C2FA; Fri, 31 Mar 2017 18:03:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 07D3818521CB; Fri, 31 Mar 2017 18:03:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2VHsA0X028355 for ; Fri, 31 Mar 2017 13:54:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0ED1217121; Fri, 31 Mar 2017 17:54:10 +0000 (UTC) Received: from mamuti.net (unknown [10.40.205.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB22F1711B for ; Fri, 31 Mar 2017 17:54:07 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id A24DE10070B; Fri, 31 Mar 2017 19:54:05 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 758DD3DBEE Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 758DD3DBEE From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 31 Mar 2017 19:53:59 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/7] qemu: Move common code in virQEMUCapsInitCPUModel one layer up X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 31 Mar 2017 18:03:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_capabilities.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b1245ad5d..1a15750a3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3111,17 +3111,11 @@ virQEMUCapsCPUFilterFeatures(const char *name, */ static int virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps, - virDomainVirtType type, + qemuMonitorCPUModelInfoPtr modelInfo, virCPUDefPtr cpu) { - qemuMonitorCPUModelInfoPtr modelInfo; size_t i; =20 - if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - modelInfo =3D qemuCaps->kvmCPUModelInfo; - else - modelInfo =3D qemuCaps->tcgCPUModelInfo; - if (!modelInfo) { virReportError(VIR_ERR_INTERNAL_ERROR, _("missing host CPU model info from QEMU capabiliti= es " @@ -3163,9 +3157,9 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps, static int virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, virDomainVirtType type, + qemuMonitorCPUModelInfoPtr model, virCPUDefPtr cpu) { - qemuMonitorCPUModelInfoPtr model; virCPUDataPtr data =3D NULL; unsigned long long sigFamily =3D 0; unsigned long long sigModel =3D 0; @@ -3174,11 +3168,6 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, int ret =3D -1; size_t i; =20 - if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - model =3D qemuCaps->kvmCPUModelInfo; - else - model =3D qemuCaps->tcgCPUModelInfo; - if (!model) return 1; =20 @@ -3239,12 +3228,18 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps, virDomainVirtType type, virCPUDefPtr cpu) { + qemuMonitorCPUModelInfoPtr model; int ret =3D 1; =20 + if (type =3D=3D VIR_DOMAIN_VIRT_KVM) + model =3D qemuCaps->kvmCPUModelInfo; + else + model =3D qemuCaps->tcgCPUModelInfo; + if (ARCH_IS_S390(qemuCaps->arch)) - ret =3D virQEMUCapsInitCPUModelS390(qemuCaps, type, cpu); + ret =3D virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu); else if (ARCH_IS_X86(qemuCaps->arch)) - ret =3D virQEMUCapsInitCPUModelX86(qemuCaps, type, cpu); + ret =3D virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu); =20 if (ret =3D=3D 0) cpu->fallback =3D VIR_CPU_FALLBACK_FORBID; --=20 2.12.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list