From nobody Wed Apr 24 09:04:52 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 1490983135928548.8232258269868; Fri, 31 Mar 2017 10:58:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36212C05681A; Fri, 31 Mar 2017 17:58:54 +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 E7CDD17113; Fri, 31 Mar 2017 17:58:53 +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 9237B18523C6; Fri, 31 Mar 2017 17:58:53 +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 v2VHsC1w028382 for ; Fri, 31 Mar 2017 13:54:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id BDCF217113; Fri, 31 Mar 2017 17:54:12 +0000 (UTC) Received: from mamuti.net (unknown [10.40.205.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3A12962926 for ; Fri, 31 Mar 2017 17:54:12 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id AC5291006A0; Fri, 31 Mar 2017 19:54:05 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 36212C05681A Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.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 36212C05681A From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 31 Mar 2017 19:54:02 +0200 Message-Id: <22ae199ca541b178d1e9a32c4fbeef21c2106bd5.1490981086.git.jdenemar@redhat.com> 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 5/7] qemu: Store migratable host CPU model in qemuCaps 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 31 Mar 2017 17:58:55 +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 | 91 ++++++++++++++++++++++++++++++++++------= ---- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c75aa570c..b426a5abc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -373,6 +373,14 @@ struct virQEMUCapsMachineType { unsigned int maxCpus; bool hotplugCpus; }; + +typedef struct _virQEMUCapsCPUModel virQEMUCapsCPUModel; +typedef virQEMUCapsCPUModel *virQEMUCapsCPUModelPtr; +struct _virQEMUCapsCPUModel { + virCPUDefPtr full; + virCPUDefPtr migratable; +}; + /* * Update the XML parser/formatter when adding more * information to this struct so that it gets cached @@ -415,8 +423,8 @@ struct _virQEMUCaps { * time we probe QEMU or load the results from the cache. */ struct { - virCPUDefPtr kvm; - virCPUDefPtr tcg; + virQEMUCapsCPUModel kvm; + virQEMUCapsCPUModel tcg; } hostCPU; }; =20 @@ -2097,12 +2105,20 @@ virQEMUCapsCopyHostCPUData(virQEMUCapsPtr dst, !(dst->tcgCPUModelInfo =3D qemuMonitorCPUModelInfoCopy(src->tcgCPU= ModelInfo))) return -1; =20 - if (src->hostCPU.kvm && - !(dst->hostCPU.kvm =3D virCPUDefCopy(src->hostCPU.kvm))) + if (src->hostCPU.kvm.full && + !(dst->hostCPU.kvm.full =3D virCPUDefCopy(src->hostCPU.kvm.full))) return -1; =20 - if (src->hostCPU.tcg && - !(dst->hostCPU.tcg =3D virCPUDefCopy(src->hostCPU.tcg))) + if (src->hostCPU.kvm.migratable && + !(dst->hostCPU.kvm.migratable =3D virCPUDefCopy(src->hostCPU.kvm.m= igratable))) + return -1; + + if (src->hostCPU.tcg.full && + !(dst->hostCPU.tcg.full =3D virCPUDefCopy(src->hostCPU.tcg.full))) + return -1; + + if (src->hostCPU.tcg.migratable && + !(dst->hostCPU.tcg.migratable =3D virCPUDefCopy(src->hostCPU.tcg.m= igratable))) return -1; =20 return 0; @@ -2197,8 +2213,10 @@ void virQEMUCapsDispose(void *obj) =20 qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo); qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo); - virCPUDefFree(qemuCaps->hostCPU.kvm); - virCPUDefFree(qemuCaps->hostCPU.tcg); + virCPUDefFree(qemuCaps->hostCPU.kvm.full); + virCPUDefFree(qemuCaps->hostCPU.kvm.migratable); + virCPUDefFree(qemuCaps->hostCPU.tcg.full); + virCPUDefFree(qemuCaps->hostCPU.tcg.migratable); } =20 void @@ -2427,9 +2445,9 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, virDomainVirtType type) { if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - return qemuCaps->hostCPU.kvm; + return qemuCaps->hostCPU.kvm.full; else - return qemuCaps->hostCPU.tcg; + return qemuCaps->hostCPU.tcg.full; } =20 =20 @@ -3276,26 +3294,40 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps, } =20 =20 +static virCPUDefPtr +virQEMUCapsNewHostCPUModel(void) +{ + virCPUDefPtr cpu; + + if (VIR_ALLOC(cpu) < 0) + return NULL; + + cpu->type =3D VIR_CPU_TYPE_GUEST; + cpu->mode =3D VIR_CPU_MODE_CUSTOM; + cpu->match =3D VIR_CPU_MATCH_EXACT; + cpu->fallback =3D VIR_CPU_FALLBACK_ALLOW; + + return cpu; +} + + void virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virCapsPtr caps, virDomainVirtType type) { virCPUDefPtr cpu =3D NULL; + virCPUDefPtr migCPU =3D NULL; virCPUDefPtr hostCPU =3D NULL; + virQEMUCapsCPUModelPtr model; int rc; =20 if (!caps || !virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch= )) return; =20 - if (VIR_ALLOC(cpu) < 0) + if (!(cpu =3D virQEMUCapsNewHostCPUModel())) goto error; =20 - cpu->type =3D VIR_CPU_TYPE_GUEST; - cpu->mode =3D VIR_CPU_MODE_CUSTOM; - cpu->match =3D VIR_CPU_MATCH_EXACT; - cpu->fallback =3D VIR_CPU_FALLBACK_ALLOW; - if ((rc =3D virQEMUCapsInitCPUModel(qemuCaps, type, cpu, false)) < 0) { goto error; } else if (rc =3D=3D 1) { @@ -3309,10 +3341,26 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, goto error; } =20 + if (!(migCPU =3D virQEMUCapsNewHostCPUModel())) + goto error; + + if ((rc =3D virQEMUCapsInitCPUModel(qemuCaps, type, migCPU, true)) < 0= ) { + goto error; + } else if (rc =3D=3D 1) { + VIR_DEBUG("CPU migratibility not provided by QEMU"); + + virCPUDefFree(migCPU); + if (!(migCPU =3D virCPUCopyMigratable(qemuCaps->arch, cpu))) + goto error; + } + if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - qemuCaps->hostCPU.kvm =3D cpu; + model =3D &qemuCaps->hostCPU.kvm; else - qemuCaps->hostCPU.tcg =3D cpu; + model =3D &qemuCaps->hostCPU.tcg; + + model->full =3D cpu; + model->migratable =3D migCPU; =20 cleanup: virCPUDefFree(hostCPU); @@ -3320,6 +3368,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, =20 error: virCPUDefFree(cpu); + virCPUDefFree(migCPU); virResetLastError(); goto cleanup; } @@ -4067,8 +4116,10 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps) qemuCaps->kvmCPUModelInfo =3D NULL; qemuCaps->tcgCPUModelInfo =3D NULL; =20 - virCPUDefFree(qemuCaps->hostCPU.kvm); - virCPUDefFree(qemuCaps->hostCPU.tcg); + virCPUDefFree(qemuCaps->hostCPU.kvm.full); + virCPUDefFree(qemuCaps->hostCPU.kvm.migratable); + virCPUDefFree(qemuCaps->hostCPU.tcg.full); + virCPUDefFree(qemuCaps->hostCPU.tcg.migratable); memset(&qemuCaps->hostCPU, 0, sizeof(qemuCaps->hostCPU)); } =20 --=20 2.12.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list