From nobody Wed Feb 11 10:09:38 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 1490370016750841.5502714132723; Fri, 24 Mar 2017 08:40:16 -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 520E9C00AFCE; Fri, 24 Mar 2017 15:40:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2217B82FA0; Fri, 24 Mar 2017 15:40:15 +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 CCE905ED64; Fri, 24 Mar 2017 15:40:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2OFeDrX023330 for ; Fri, 24 Mar 2017 11:40:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id F176884010; Fri, 24 Mar 2017 15:40:12 +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 C352D60BEF for ; Fri, 24 Mar 2017 15:40:10 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id B9358103262; Fri, 24 Mar 2017 16:40:09 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 520E9C00AFCE 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 520E9C00AFCE From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 24 Mar 2017 16:40:08 +0100 Message-Id: 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.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] qemu: Free persistent def inside qemuMigrationCookieFree 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.32]); Fri, 24 Mar 2017 15:40:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Creating a copy of the definition we want to add in a migration cookie makes the code cleaner and less prone to memory leaks or double free errors. Signed-off-by: Jiri Denemark --- src/qemu/qemu_migration.c | 18 ++++++++---------- src/qemu/qemu_migration_cookie.c | 8 +++++--- src/qemu/qemu_migration_cookie.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b1d141755..9e0e63cf0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3291,11 +3291,13 @@ qemuMigrationRun(virQEMUDriverPtr driver, if (persist_xml) { persistDef =3D qemuMigrationPrepareDef(driver, persist_xml, NULL, NULL); - if (!persistDef) - goto cleanup; } else { - persistDef =3D vm->newDef; + persistDef =3D qemuDomainDefCopy(driver, vm->newDef, + VIR_DOMAIN_XML_SECURE | + VIR_DOMAIN_XML_MIGRATABLE); } + if (!persistDef) + goto cleanup; } =20 mig =3D qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, @@ -3505,14 +3507,13 @@ qemuMigrationRun(virQEMUDriverPtr driver, QEMU_MIGRATION_COOKIE_STATS; =20 if (ret =3D=3D 0 && - (qemuMigrationCookieAddPersistent(mig, persistDef) < 0 || + (qemuMigrationCookieAddPersistent(mig, &persistDef) < 0 || qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, cookieFlags) < 0)) { VIR_WARN("Unable to encode migration cookie"); } =20 - if (persistDef !=3D vm->newDef) - virDomainDefFree(persistDef); + virDomainDefFree(persistDef); qemuMigrationCookieFree(mig); =20 if (events) @@ -4997,10 +4998,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, qemuMonitorSetDomainLog(priv->mon, NULL, NULL, NULL); VIR_FREE(priv->origname); virDomainObjEndAPI(&vm); - if (mig) { - virDomainDefFree(qemuMigrationCookieGetPersistent(mig)); - qemuMigrationCookieFree(mig); - } + qemuMigrationCookieFree(mig); if (orig_err) { virSetError(orig_err); virFreeError(orig_err); diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 0f4bcaddc..bd12f1124 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -99,6 +99,7 @@ qemuMigrationCookieFree(qemuMigrationCookiePtr mig) return; =20 qemuMigrationCookieGraphicsFree(mig->graphics); + virDomainDefFree(mig->persistent); qemuMigrationCookieNetworkFree(mig->network); qemuMigrationCookieNBDFree(mig->nbd); =20 @@ -385,7 +386,7 @@ qemuMigrationCookieAddLockstate(qemuMigrationCookiePtr = mig, =20 int qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig, - virDomainDefPtr def) + virDomainDefPtr *def) { if (mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -393,10 +394,11 @@ qemuMigrationCookieAddPersistent(qemuMigrationCookieP= tr mig, return -1; } =20 - if (!def) + if (!def || !*def) return 0; =20 - mig->persistent =3D def; + mig->persistent =3D *def; + *def =3D NULL; mig->flags |=3D QEMU_MIGRATION_COOKIE_PERSISTENT; mig->flagsMandatory |=3D QEMU_MIGRATION_COOKIE_PERSISTENT; return 0; diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_coo= kie.h index 87eeb8682..f4de4da68 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -145,7 +145,7 @@ qemuMigrationCookieFree(qemuMigrationCookiePtr mig); =20 int qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig, - virDomainDefPtr def); + virDomainDefPtr *def); =20 virDomainDefPtr qemuMigrationCookieGetPersistent(qemuMigrationCookiePtr mig); --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list