From nobody Mon Feb 9 00:56:23 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 1490799860815614.9210180641976; Wed, 29 Mar 2017 08:04:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 192684AEA8; Wed, 29 Mar 2017 15:04:19 +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 E176C183AD; Wed, 29 Mar 2017 15:04:18 +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 8C53218523CA; Wed, 29 Mar 2017 15:04:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2TErOlh026182 for ; Wed, 29 Mar 2017 10:53:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 09C77B23F0; Wed, 29 Mar 2017 14:53:24 +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 AC311183AD for ; Wed, 29 Mar 2017 14:53:21 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 2B1B910669A; Wed, 29 Mar 2017 16:53:20 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 192684AEA8 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.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 192684AEA8 From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 16:53:17 +0200 Message-Id: <6a4a7916766d39535d95a40a8dc844d7fab4a3e8.1490798631.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.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] qemuMonitorCPUModelInfo: Add support for non-migratable features 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 29 Mar 2017 15:04:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" QEMU is able to tell us whether a CPU feature would block migration or not. This patch adds support for storing such features in qemuMonitorCPUModelInfo. Signed-off-by: Jiri Denemark --- src/qemu/qemu_capabilities.c | 39 ++++++++++++++++++++= +--- src/qemu/qemu_monitor.c | 2 ++ src/qemu/qemu_monitor.h | 2 ++ tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 4 +-- 5 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f51141b99..446c15f92 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3272,6 +3272,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCa= ps, int ret =3D -1; size_t i; int n; + int val; =20 if (virtType =3D=3D VIR_DOMAIN_VIRT_KVM) hostCPUNode =3D virXPathNode("./hostCPU[@type=3D'kvm']", ctxt); @@ -3293,6 +3294,15 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuC= aps, goto cleanup; } =20 + if (!(str =3D virXMLPropString(hostCPUNode, "migratability")) || + (val =3D virTristateBoolTypeFromString(str)) <=3D 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid migratability value for host CPU model")= ); + goto cleanup; + } + hostCPU->migratability =3D val =3D=3D VIR_TRISTATE_BOOL_YES; + VIR_FREE(str); + ctxt->node =3D hostCPUNode; =20 if ((n =3D virXPathNodeSet("./property", ctxt, &nodes)) > 0) { @@ -3303,7 +3313,6 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCa= ps, =20 for (i =3D 0; i < n; i++) { qemuMonitorCPUPropertyPtr prop =3D hostCPU->props + i; - int type; =20 ctxt->node =3D nodes[i]; =20 @@ -3315,7 +3324,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCa= ps, } =20 if (!(str =3D virXMLPropString(ctxt->node, "type")) || - (type =3D qemuMonitorCPUPropertyTypeFromString(str)) < 0) { + (val =3D qemuMonitorCPUPropertyTypeFromString(str)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing or invalid CPU model property ty= pe " "in QEMU capabilities cache")); @@ -3323,7 +3332,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCa= ps, } VIR_FREE(str); =20 - prop->type =3D type; + prop->type =3D val; switch (prop->type) { case QEMU_MONITOR_CPU_PROPERTY_BOOLEAN: if (virXPathBoolean("./@value=3D'true'", ctxt)) @@ -3355,6 +3364,19 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuC= aps, case QEMU_MONITOR_CPU_PROPERTY_LAST: break; } + + if ((str =3D virXMLPropString(ctxt->node, "migratable"))) { + if ((val =3D virTristateBoolTypeFromString(str)) <=3D 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown migratable value for '%s' ho= st " + "CPU model property"), + prop->name); + goto cleanup; + } + + prop->migratable =3D val; + VIR_FREE(str); + } } } =20 @@ -3707,8 +3729,10 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qem= uCaps, if (!model) return; =20 - virBufferAsprintf(buf, "\n", - typeStr, model->name); + virBufferAsprintf(buf, + "\n", + typeStr, model->name, + model->migratability ? "yes" : "no"); virBufferAdjustIndent(buf, 2); =20 for (i =3D 0; i < model->nprops; i++) { @@ -3735,6 +3759,11 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qem= uCaps, case QEMU_MONITOR_CPU_PROPERTY_LAST: break; } + + if (prop->migratable > 0) + virBufferAsprintf(buf, " migratable=3D'%s'", + virTristateBoolTypeToString(prop->migratable= )); + virBufferAddLit(buf, "/>\n"); } =20 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 78d9cb752..e9ba5fdea 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3747,12 +3747,14 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUMod= elInfo *orig) if (VIR_STRDUP(copy->name, orig->name) < 0) goto error; =20 + copy->migratability =3D orig->migratability; copy->nprops =3D orig->nprops; =20 for (i =3D 0; i < orig->nprops; i++) { if (VIR_STRDUP(copy->props[i].name, orig->props[i].name) < 0) goto error; =20 + copy->props[i].migratable =3D orig->props[i].migratable; copy->props[i].type =3D orig->props[i].type; switch (orig->props[i].type) { case QEMU_MONITOR_CPU_PROPERTY_BOOLEAN: diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 87a1496cf..332652178 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -992,6 +992,7 @@ struct _qemuMonitorCPUProperty { char *string; long long number; } value; + virTristateBool migratable; }; =20 typedef struct _qemuMonitorCPUModelInfo qemuMonitorCPUModelInfo; @@ -1001,6 +1002,7 @@ struct _qemuMonitorCPUModelInfo { char *name; size_t nprops; qemuMonitorCPUPropertyPtr props; + bool migratability; }; =20 typedef enum { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.8.0.s390x.xml index d49f0fbd1..42c92c567 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -136,7 +136,7 @@ 0 s390x - + diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index bb5463469..0b14e53e2 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -211,7 +211,7 @@ 0 (v2.9.0-rc0-142-g940a8ce) x86_64 - + @@ -443,7 +443,7 @@ - + --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list