From nobody Fri May 16 07:35:32 2025 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 1496824719738667.5924791692798; Wed, 7 Jun 2017 01:38:39 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89F32C034E7B; Wed, 7 Jun 2017 08:38:37 +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 4D8CD7D500; Wed, 7 Jun 2017 08:38:37 +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 10864183269A; Wed, 7 Jun 2017 08:38:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v578bqRn004856 for ; Wed, 7 Jun 2017 04:37:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id B80AE1724E; Wed, 7 Jun 2017 08:37:52 +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 6320E5C88E for ; Wed, 7 Jun 2017 08:37:52 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 8FB1D10193B; Wed, 7 Jun 2017 10:37:46 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 89F32C034E7B Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.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 89F32C034E7B From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 7 Jun 2017 10:37:41 +0200 Message-Id: <1ba16ed55cfda99b2e1b06c9774aed86e2519214.1496824604.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.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 16/20] qemu: Report the original CPU in migratable xml 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 07 Jun 2017 08:38:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The destination host may not be able to start a domain using the live updated CPU definition because either libvirt or QEMU may not be new enough. Thus we need to send the original guest CPU definition. Signed-off-by: Jiri Denemark Reviewed-by: Pavel Hrdina --- Notes: Version 2: - no change src/qemu/qemu_domain.c | 61 ++++++++++++++++++++++++++++++++++++++-----= ---- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 13 ++++++---- src/qemu/qemu_migration.c | 5 ++-- 4 files changed, 63 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ba8079ba0..0da44f066 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4216,11 +4216,13 @@ qemuDomainDefCopy(virQEMUDriverPtr driver, return ret; } =20 -int -qemuDomainDefFormatBuf(virQEMUDriverPtr driver, - virDomainDefPtr def, - unsigned int flags, - virBuffer *buf) + +static int +qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, + virDomainDefPtr def, + virCPUDefPtr origCPU, + unsigned int flags, + virBuffer *buf) { int ret =3D -1; virDomainDefPtr copy =3D NULL; @@ -4341,6 +4343,16 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, if (qemuDomainChrDefDropDefaultPath(def->channels[i], driver) = < 0) goto cleanup; } + + /* Replace the CPU definition updated according to QEMU with the o= ne + * used for starting the domain. The updated def will be sent + * separately for backward compatibility. + */ + if (origCPU) { + virCPUDefFree(def->cpu); + if (!(def->cpu =3D virCPUDefCopy(origCPU))) + goto cleanup; + } } =20 format: @@ -4354,13 +4366,26 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, return ret; } =20 -char *qemuDomainDefFormatXML(virQEMUDriverPtr driver, - virDomainDefPtr def, - unsigned int flags) + +int +qemuDomainDefFormatBuf(virQEMUDriverPtr driver, + virDomainDefPtr def, + unsigned int flags, + virBufferPtr buf) +{ + return qemuDomainDefFormatBufInternal(driver, def, NULL, flags, buf); +} + + +static char * +qemuDomainDefFormatXMLInternal(virQEMUDriverPtr driver, + virDomainDefPtr def, + virCPUDefPtr origCPU, + unsigned int flags) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; =20 - if (qemuDomainDefFormatBuf(driver, def, flags, &buf) < 0) { + if (qemuDomainDefFormatBufInternal(driver, def, origCPU, flags, &buf) = < 0) { virBufferFreeAndReset(&buf); return NULL; } @@ -4374,26 +4399,40 @@ char *qemuDomainDefFormatXML(virQEMUDriverPtr drive= r, return virBufferContentAndReset(&buf); } =20 + +char * +qemuDomainDefFormatXML(virQEMUDriverPtr driver, + virDomainDefPtr def, + unsigned int flags) +{ + return qemuDomainDefFormatXMLInternal(driver, def, NULL, flags); +} + + char *qemuDomainFormatXML(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { virDomainDefPtr def; + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virCPUDefPtr origCPU =3D NULL; =20 if ((flags & VIR_DOMAIN_XML_INACTIVE) && vm->newDef) { def =3D vm->newDef; } else { def =3D vm->def; + origCPU =3D priv->origCPU; if (virDomainObjIsActive(vm)) flags &=3D ~VIR_DOMAIN_XML_UPDATE_CPU; } =20 - return qemuDomainDefFormatXML(driver, def, flags); + return qemuDomainDefFormatXMLInternal(driver, def, origCPU, flags); } =20 char * qemuDomainDefFormatLive(virQEMUDriverPtr driver, virDomainDefPtr def, + virCPUDefPtr origCPU, bool inactive, bool compatible) { @@ -4404,7 +4443,7 @@ qemuDomainDefFormatLive(virQEMUDriverPtr driver, if (compatible) flags |=3D VIR_DOMAIN_XML_MIGRATABLE; =20 - return qemuDomainDefFormatXML(driver, def, flags); + return qemuDomainDefFormatXMLInternal(driver, def, origCPU, flags); } =20 =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f6dad4378..08c0b32f1 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -515,6 +515,7 @@ char *qemuDomainFormatXML(virQEMUDriverPtr driver, =20 char *qemuDomainDefFormatLive(virQEMUDriverPtr driver, virDomainDefPtr def, + virCPUDefPtr origCPU, bool inactive, bool compatible); =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5de9513aa..5766ece80 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3344,9 +3344,9 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDo= mainPtr dom, virDomainDefFree(def); goto endjob; } - xml =3D qemuDomainDefFormatLive(driver, def, true, true); + xml =3D qemuDomainDefFormatLive(driver, def, NULL, true, true); } else { - xml =3D qemuDomainDefFormatLive(driver, vm->def, true, true); + xml =3D qemuDomainDefFormatLive(driver, vm->def, priv->origCPU, tr= ue, true); } if (!xml) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -14511,7 +14511,8 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPt= r conn, "snapshot", false)) < = 0) goto cleanup; =20 - if (!(xml =3D qemuDomainDefFormatLive(driver, vm->def, true, true)= ) || + if (!(xml =3D qemuDomainDefFormatLive(driver, vm->def, priv->origC= PU, + true, true)) || !(snap->def->cookie =3D (virObjectPtr) qemuDomainSaveCookieNew= (vm))) goto cleanup; =20 @@ -14622,6 +14623,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, bool align_match =3D true; virQEMUDriverConfigPtr cfg =3D NULL; virCapsPtr caps =3D NULL; + qemuDomainObjPrivatePtr priv; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT | @@ -14739,6 +14741,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, =20 qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE); =20 + priv =3D vm->privateData; + if (redefine) { if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap, driver->xmlopt, @@ -14747,7 +14751,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, } else { /* Easiest way to clone inactive portion of vm->def is via * conversion in and back out of xml. */ - if (!(xml =3D qemuDomainDefFormatLive(driver, vm->def, true, true)= ) || + if (!(xml =3D qemuDomainDefFormatLive(driver, vm->def, priv->origC= PU, + true, true)) || !(def->dom =3D virDomainDefParseString(xml, caps, driver->xmlo= pt, NULL, VIR_DOMAIN_DEF_PARSE_INAC= TIVE | VIR_DOMAIN_DEF_PARSE_SKIP= _VALIDATE))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3c0d7e957..2cd862875 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2059,9 +2059,10 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, if (!qemuDomainDefCheckABIStability(driver, vm->def, def)) goto cleanup; =20 - rv =3D qemuDomainDefFormatLive(driver, def, false, true); + rv =3D qemuDomainDefFormatLive(driver, def, NULL, false, true); } else { - rv =3D qemuDomainDefFormatLive(driver, vm->def, false, true); + rv =3D qemuDomainDefFormatLive(driver, vm->def, priv->origCPU, + false, true); } =20 cleanup: --=20 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list