From nobody Sun Feb 8 13:39:36 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 1491564251697368.58345043066686; Fri, 7 Apr 2017 04:24:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5CCBC065844; Fri, 7 Apr 2017 11:24:09 +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 A5EA3ABE7C; 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 56A9B18523CE; Fri, 7 Apr 2017 11:24:09 +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 v37BO3jW008570 for ; Fri, 7 Apr 2017 07:24:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 31D15A63CA; 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 D26E4A63C8 for ; Fri, 7 Apr 2017 11:24:01 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id C8930101C9B; Fri, 7 Apr 2017 13:23:59 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D5CCBC065844 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 D5CCBC065844 From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 13:23:56 +0200 Message-Id: <0268df40205836dc29a4ca7fc9b45e6001ea07ed.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.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] Revert "qemu: Pass migratable host model to virCPUUpdate" 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 07 Apr 2017 11:24:10 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This reverts commit 959e72d323d06d67a5c3a759869af6da49da0e0e which was pushed accidentally. Signed-off-by: Jiri Denemark --- src/qemu/qemu_capabilities.c | 19 +++++-------------- src/qemu/qemu_capabilities.h | 3 +-- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_process.c | 4 ++-- tests/cputest.c | 7 +------ 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d2eef4321..964299b01 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2446,20 +2446,12 @@ virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCap= s, =20 virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, - virDomainVirtType type, - bool migratable) + virDomainVirtType type) { - virQEMUCapsCPUModelPtr model; - if (type =3D=3D VIR_DOMAIN_VIRT_KVM) - model =3D &qemuCaps->hostCPU.kvm; + return qemuCaps->hostCPU.kvm.full; else - model =3D &qemuCaps->hostCPU.tcg; - - if (migratable) - return model->migratable; - else - return model->full; + return qemuCaps->hostCPU.tcg.full; } =20 =20 @@ -2477,7 +2469,7 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps, virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch); =20 case VIR_CPU_MODE_HOST_MODEL: - return !!virQEMUCapsGetHostModel(qemuCaps, type, false); + return !!virQEMUCapsGetHostModel(qemuCaps, type); =20 case VIR_CPU_MODE_CUSTOM: if (type =3D=3D VIR_DOMAIN_VIRT_KVM) @@ -5542,8 +5534,7 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps, =20 if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype, VIR_CPU_MODE_HOST_MODEL)) { - virCPUDefPtr cpu =3D virQEMUCapsGetHostModel(qemuCaps, domCaps->vi= rttype, - false); + virCPUDefPtr cpu =3D virQEMUCapsGetHostModel(qemuCaps, domCaps->vi= rttype); domCaps->cpu.hostModel =3D virCPUDefCopy(cpu); } =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 9959c71a6..cca9a12b5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -450,8 +450,7 @@ int virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCap= s, char ***names, size_t *count); virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, - virDomainVirtType type, - bool migratable); + virDomainVirtType type); bool virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps, virCapsPtr caps, virDomainVirtType type, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7049be20a..445c696d6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6887,7 +6887,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, if (def->cpu->mode =3D=3D VIR_CPU_MODE_CUSTOM) cpuDef =3D def->cpu; else if (def->cpu->mode =3D=3D VIR_CPU_MODE_HOST_PASSTHROUGH) - cpuDef =3D virQEMUCapsGetHostModel(qemuCaps, def->virtType= , false); + cpuDef =3D virQEMUCapsGetHostModel(qemuCaps, def->virtType= ); =20 if (cpuDef) { int svm =3D virCPUCheckFeature(def->os.arch, cpuDef, "svm"= ); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b4499beaf..8323a1831 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5304,12 +5304,12 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, =20 if (def->cpu->check =3D=3D VIR_CPU_CHECK_PARTIAL && virCPUCompare(caps->host.arch, - virQEMUCapsGetHostModel(qemuCaps, def->virtType, fal= se), + virQEMUCapsGetHostModel(qemuCaps, def->virtType), def->cpu, true) < 0) return -1; =20 if (virCPUUpdate(def->os.arch, def->cpu, - virQEMUCapsGetHostModel(qemuCaps, def->virtType, true= )) < 0) + virQEMUCapsGetHostModel(qemuCaps, def->virtType)) < 0) goto cleanup; =20 if (virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType, diff --git a/tests/cputest.c b/tests/cputest.c index d5e023c40..528030754 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -393,7 +393,6 @@ cpuTestUpdate(const void *arg) const struct data *data =3D arg; int ret =3D -1; virCPUDefPtr host =3D NULL; - virCPUDefPtr migHost =3D NULL; virCPUDefPtr cpu =3D NULL; char *result =3D NULL; =20 @@ -401,10 +400,7 @@ cpuTestUpdate(const void *arg) !(cpu =3D cpuTestLoadXML(data->arch, data->name))) goto cleanup; =20 - if (!(migHost =3D virCPUCopyMigratable(data->arch, host))) - goto cleanup; - - if (virCPUUpdate(host->arch, cpu, migHost) < 0) + if (virCPUUpdate(host->arch, cpu, host) < 0) goto cleanup; =20 if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0) @@ -415,7 +411,6 @@ cpuTestUpdate(const void *arg) cleanup: virCPUDefFree(host); virCPUDefFree(cpu); - virCPUDefFree(migHost); VIR_FREE(result); return ret; } --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list