From nobody Sun Feb 8 15:54:20 2026 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 1491564251925843.6328184549632; Fri, 7 Apr 2017 04:24:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 251502EF182; Fri, 7 Apr 2017 11:24:10 +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 EADE41801A; Fri, 7 Apr 2017 11:24:09 +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 9DFAB18523CC; Fri, 7 Apr 2017 11:24:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37BO317008582 for ; Fri, 7 Apr 2017 07:24:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 51D9D7FB6F; Fri, 7 Apr 2017 11:24:03 +0000 (UTC) Received: from virval.usersys.redhat.com (dhcp129-92.brq.redhat.com [10.34.129.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F33137FB77 for ; Fri, 7 Apr 2017 11:24:01 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id CA7A6101C9C; Fri, 7 Apr 2017 13:23:59 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 251502EF182 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.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 251502EF182 From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 13:23:57 +0200 Message-Id: <9ad3cd16d6ab4d7879c0dd4fb2056c712b04e3b3.1491564112.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.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] Revert "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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Apr 2017 11:24:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This reverts commit dfc711dc8cf08e942b01e6ead3de117e6522e5cd which was pushed accidentally. Signed-off-by: Jiri Denemark --- src/qemu/qemu_capabilities.c | 91 ++++++++++------------------------------= ---- 1 file changed, 20 insertions(+), 71 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 964299b01..74fe2c258 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -373,14 +373,6 @@ 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 @@ -423,8 +415,8 @@ struct _virQEMUCaps { * time we probe QEMU or load the results from the cache. */ struct { - virQEMUCapsCPUModel kvm; - virQEMUCapsCPUModel tcg; + virCPUDefPtr kvm; + virCPUDefPtr tcg; } hostCPU; }; =20 @@ -2109,20 +2101,12 @@ virQEMUCapsCopyHostCPUData(virQEMUCapsPtr dst, !(dst->tcgCPUModelInfo =3D qemuMonitorCPUModelInfoCopy(src->tcgCPU= ModelInfo))) return -1; =20 - if (src->hostCPU.kvm.full && - !(dst->hostCPU.kvm.full =3D virCPUDefCopy(src->hostCPU.kvm.full))) + if (src->hostCPU.kvm && + !(dst->hostCPU.kvm =3D virCPUDefCopy(src->hostCPU.kvm))) return -1; =20 - 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))) + if (src->hostCPU.tcg && + !(dst->hostCPU.tcg =3D virCPUDefCopy(src->hostCPU.tcg))) return -1; =20 return 0; @@ -2217,10 +2201,8 @@ void virQEMUCapsDispose(void *obj) =20 qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo); qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo); - virCPUDefFree(qemuCaps->hostCPU.kvm.full); - virCPUDefFree(qemuCaps->hostCPU.kvm.migratable); - virCPUDefFree(qemuCaps->hostCPU.tcg.full); - virCPUDefFree(qemuCaps->hostCPU.tcg.migratable); + virCPUDefFree(qemuCaps->hostCPU.kvm); + virCPUDefFree(qemuCaps->hostCPU.tcg); } =20 void @@ -2449,9 +2431,9 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, virDomainVirtType type) { if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - return qemuCaps->hostCPU.kvm.full; + return qemuCaps->hostCPU.kvm; else - return qemuCaps->hostCPU.tcg.full; + return qemuCaps->hostCPU.tcg; } =20 =20 @@ -3298,40 +3280,26 @@ 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 (!(cpu =3D virQEMUCapsNewHostCPUModel())) + if (VIR_ALLOC(cpu) < 0) 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) { @@ -3345,26 +3313,10 @@ 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) - model =3D &qemuCaps->hostCPU.kvm; + qemuCaps->hostCPU.kvm =3D cpu; else - model =3D &qemuCaps->hostCPU.tcg; - - model->full =3D cpu; - model->migratable =3D migCPU; + qemuCaps->hostCPU.tcg =3D cpu; =20 cleanup: virCPUDefFree(hostCPU); @@ -3372,7 +3324,6 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, =20 error: virCPUDefFree(cpu); - virCPUDefFree(migCPU); virResetLastError(); goto cleanup; } @@ -4120,10 +4071,8 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps) qemuCaps->kvmCPUModelInfo =3D NULL; qemuCaps->tcgCPUModelInfo =3D NULL; =20 - virCPUDefFree(qemuCaps->hostCPU.kvm.full); - virCPUDefFree(qemuCaps->hostCPU.kvm.migratable); - virCPUDefFree(qemuCaps->hostCPU.tcg.full); - virCPUDefFree(qemuCaps->hostCPU.tcg.migratable); + virCPUDefFree(qemuCaps->hostCPU.kvm); + virCPUDefFree(qemuCaps->hostCPU.tcg); memset(&qemuCaps->hostCPU, 0, sizeof(qemuCaps->hostCPU)); } =20 --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list