From nobody Sun Feb 8 22:00:45 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.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565274513; cv=none; d=zoho.com; s=zohoarc; b=ZIhh0nugfH/ULQZAPf4rzAGIeOFnjtZsqv5QTKsShtfcTL4601jcYbnrSH3EXBr6Lp88msoHB5PS0p8sB7OImtyQm4MJWhpUm+uVRw26HyyuBPU/ACXUeaTJMPVDgAROtxrKYgy8PQpGXsrWdKNEGMeZ4ayCrRByJrIcH+8LGGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565274513; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OsuayLstrsIUwBBu8XwdfDX62XX8X9kyOw0GlDIV870=; b=SPmtC7XQsLgSWxfMktpZdqE45YtAjHaPhGxNAgkhLC6eZme022ckHaTntqdNjUO8NKFE3VmSCS5afKlzeed6l8hTAJYnI7dPjVaImUrfK2Ub75jh3PV5H+7nAfFI55gid13oTfA62Asl19joOeUJnxS+kKubyuAgKltEkjqhHvQ= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565274513546249.9739210756411; Thu, 8 Aug 2019 07:28:33 -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 6191E30C0616; Thu, 8 Aug 2019 14:28:32 +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 36F2660BEC; Thu, 8 Aug 2019 14:28:32 +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 ECAFC1806B00; Thu, 8 Aug 2019 14:28:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x78EQoGV017458 for ; Thu, 8 Aug 2019 10:26:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BFC61001958; Thu, 8 Aug 2019 14:26:50 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0ECF1001955 for ; Thu, 8 Aug 2019 14:26:48 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 2FE50100916; Thu, 8 Aug 2019 16:26:47 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 16:26:35 +0200 Message-Id: <0851af09827e70940d01fe5265873938960d1fb0.1565271790.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/10] qemu: Pass qemuCaps to qemuDomainDefCopy 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: , 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.44]); Thu, 08 Aug 2019 14:28:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Since qemuDomainDefPostParse callback requires qemuCaps, we need to make sure it gets the capabilities stored in the domain's private data if the domain is running. Passing NULL may cause QEMU capabilities probing to be triggered in case QEMU binary changed in the meantime. When this happens while a running domain object is locked, QMP event delivered to the domain before QEMU capabilities probing finishes will deadlock the event loop. This patch fixes all paths leading to qemuDomainDefCopy. Signed-off-by: Jiri Denemark --- src/qemu/qemu_domain.c | 16 ++++++++++------ src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 9 +++++---- src/qemu/qemu_migration.c | 4 ++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0555caa6ab..dba5db68ec 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8361,6 +8361,7 @@ qemuDomainObjExitRemote(virDomainObjPtr obj, =20 static virDomainDefPtr qemuDomainDefFromXML(virQEMUDriverPtr driver, + virQEMUCapsPtr qemuCaps, const char *xml) { virCapsPtr caps; @@ -8369,7 +8370,7 @@ qemuDomainDefFromXML(virQEMUDriverPtr driver, if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) return NULL; =20 - def =3D virDomainDefParseString(xml, caps, driver->xmlopt, NULL, + def =3D virDomainDefParseString(xml, caps, driver->xmlopt, qemuCaps, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); =20 @@ -8380,6 +8381,7 @@ qemuDomainDefFromXML(virQEMUDriverPtr driver, =20 virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, + virQEMUCapsPtr qemuCaps, virDomainDefPtr src, unsigned int flags) { @@ -8389,7 +8391,7 @@ qemuDomainDefCopy(virQEMUDriverPtr driver, if (!(xml =3D qemuDomainDefFormatXML(driver, src, flags))) return NULL; =20 - ret =3D qemuDomainDefFromXML(driver, xml); + ret =3D qemuDomainDefFromXML(driver, qemuCaps, xml); =20 VIR_FREE(xml); return ret; @@ -10616,6 +10618,7 @@ qemuDomainMigratableDefCheckABIStability(virQEMUDri= verPtr driver, =20 bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, + virQEMUCapsPtr qemuCaps, virDomainDefPtr src, virDomainDefPtr dst) { @@ -10623,8 +10626,8 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr dri= ver, virDomainDefPtr migratableDefDst =3D NULL; bool ret =3D false; =20 - if (!(migratableDefSrc =3D qemuDomainDefCopy(driver, src, COPY_FLAGS))= || - !(migratableDefDst =3D qemuDomainDefCopy(driver, dst, COPY_FLAGS))) + if (!(migratableDefSrc =3D qemuDomainDefCopy(driver, qemuCaps, src, CO= PY_FLAGS)) || + !(migratableDefDst =3D qemuDomainDefCopy(driver, qemuCaps, dst, CO= PY_FLAGS))) goto cleanup; =20 ret =3D qemuDomainMigratableDefCheckABIStability(driver, @@ -10643,14 +10646,15 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driv= er, virDomainObjPtr vm, virDomainDefPtr dst) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr migratableSrc =3D NULL; virDomainDefPtr migratableDst =3D NULL; char *xml =3D NULL; bool ret =3D false; =20 if (!(xml =3D qemuDomainFormatXML(driver, vm, COPY_FLAGS)) || - !(migratableSrc =3D qemuDomainDefFromXML(driver, xml)) || - !(migratableDst =3D qemuDomainDefCopy(driver, dst, COPY_FLAGS))) + !(migratableSrc =3D qemuDomainDefFromXML(driver, priv->qemuCaps, x= ml)) || + !(migratableDst =3D qemuDomainDefCopy(driver, priv->qemuCaps, dst,= COPY_FLAGS))) goto cleanup; =20 ret =3D qemuDomainMigratableDefCheckABIStability(driver, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b76d3cace9..94ff6e7bd3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -649,6 +649,7 @@ int qemuDomainObjExitRemote(virDomainObjPtr obj, ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; =20 virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, + virQEMUCapsPtr qemuCaps, virDomainDefPtr src, unsigned int flags); =20 @@ -863,6 +864,7 @@ int qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr d= river, int asyncJob); =20 bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, + virQEMUCapsPtr qemuCaps, virDomainDefPtr src, virDomainDefPtr dst); =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ff83d1c024..4d6a933243 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6764,7 +6764,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; =20 - if (!(newdef_migr =3D qemuDomainDefCopy(driver, + if (!(newdef_migr =3D qemuDomainDefCopy(driver, NULL, newdef, QEMU_DOMAIN_FORMAT_LIVE_FLAGS | VIR_DOMAIN_XML_MIGRATABLE))) @@ -16553,7 +16553,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, switch ((virDomainSnapshotState) snapdef->state) { case VIR_DOMAIN_SNAPSHOT_RUNNING: case VIR_DOMAIN_SNAPSHOT_PAUSED: - + priv =3D vm->privateData; start_flags |=3D VIR_QEMU_PROCESS_START_PAUSED; =20 /* Transitions 2, 3, 5, 6, 8, 9 */ @@ -16580,7 +16580,9 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, if (!(config->cpu =3D virCPUDefCopy(cookie->cpu))) goto endjob; =20 - compatible =3D qemuDomainDefCheckABIStability(driver, = vm->def, + compatible =3D qemuDomainDefCheckABIStability(driver, + priv->qemu= Caps, + vm->def, config); } else { compatible =3D qemuDomainCheckABIStability(driver, vm,= config); @@ -16624,7 +16626,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, } } =20 - priv =3D vm->privateData; if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_RUNNING) { /* Transitions 5, 6 */ if (qemuProcessStopCPUs(driver, vm, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7c6be201b9..ec1cae8bec 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2381,7 +2381,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, if (!newdef) goto cleanup; =20 - if (!qemuDomainDefCheckABIStability(driver, *def, newdef))= { + if (!qemuDomainDefCheckABIStability(driver, NULL, *def, ne= wdef)) { virDomainDefFree(newdef); goto cleanup; } @@ -3427,7 +3427,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, goto error; } else { virDomainDefPtr def =3D vm->newDef ? vm->newDef : vm->def; - if (!(persistDef =3D qemuDomainDefCopy(driver, def, + if (!(persistDef =3D qemuDomainDefCopy(driver, priv->qemuCaps,= def, VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_MIGRATABLE= ))) goto error; --=20 2.22.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list