From nobody Mon Feb 9 03:46:34 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=1561390878; cv=none; d=zoho.com; s=zohoarc; b=ogSqRjdlOvD9CN3Dtunn37ImN8SfgcbD/x7KWJt/oP7kOwOii0iP/r5CpqzlweXCnZI8skfDyNEzc6qUtP/AEcVSyPtjEQQo5LINV7u81b8bPH7fASFijowkmKE7QqmCxMx2BNjVCyZq67kBF3pRP2BR93Jy4DfxltE1gMF38kA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561390878; 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=wGkuFTpkEJM4wNBG2TQD7NGsKs+AvMa47dKKyYmAYXU=; b=nDnCShG5IhY/MXCsopaQhoxPohdzKRzi4obG4tvyKE+3pjRbm/5hR5ib5Nj4eUlEAn5x1kgSmGtO6QY4DLegMv1GEM4ExEJlU0bIdAgABCBIngPYUscAwXFjzcFO9ayVfEXN7azw4XCfdNlCBwQNSOKIeaSb7355Gj8JAgKiOPY= 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 1561390878179439.7560583391239; Mon, 24 Jun 2019 08:41:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 59C8430C31B4; Mon, 24 Jun 2019 15:40:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31BD9600D1; Mon, 24 Jun 2019 15:40:56 +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 E2E9219728; Mon, 24 Jun 2019 15:40:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5OFd1lc020834 for ; Mon, 24 Jun 2019 11:39:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 543EE5D9D3; Mon, 24 Jun 2019 15:39:01 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2C4B5D9C5 for ; Mon, 24 Jun 2019 15:39:00 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 24 Jun 2019 17:38:47 +0200 Message-Id: <31178e03bced576cb1e7b71e689e41376cd907e3.1561390513.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/10] qemu: hotplug: Handle copy-on-read filter separate from rest of backing chain 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 24 Jun 2019 15:41:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We use only one copy-on-read filter per disk, so we should handle it separately from the chain. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 46 ++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fe2f577d58..f96209a0bd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -420,10 +420,6 @@ qemuHotplugRemoveManagedPR(virQEMUDriverPtr driver, struct _qemuHotplugDiskSourceData { qemuBlockStorageSourceAttachDataPtr *backends; size_t nbackends; - - /* disk copy-on-read object */ - virJSONValuePtr corProps; - char *corAlias; }; typedef struct _qemuHotplugDiskSourceData qemuHotplugDiskSourceData; typedef qemuHotplugDiskSourceData *qemuHotplugDiskSourceDataPtr; @@ -437,9 +433,6 @@ qemuHotplugDiskSourceDataFree(qemuHotplugDiskSourceData= Ptr data) if (!data) return; - virJSONValueFree(data->corProps); - VIR_FREE(data->corAlias); - for (i =3D 0; i < data->nbackends; i++) qemuBlockStorageSourceAttachDataFree(data->backends[i]); @@ -453,7 +446,6 @@ qemuHotplugDiskSourceRemovePrepare(virDomainDiskDefPtr = disk, virStorageSourcePtr src, virQEMUCapsPtr qemuCaps) { - qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); VIR_AUTOPTR(qemuBlockStorageSourceAttachData) backend =3D NULL; qemuHotplugDiskSourceDataPtr data =3D NULL; qemuHotplugDiskSourceDataPtr ret =3D NULL; @@ -464,9 +456,6 @@ qemuHotplugDiskSourceRemovePrepare(virDomainDiskDefPtr = disk, return NULL; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (VIR_STRDUP(data->corAlias, diskPriv->nodeCopyOnRead) < 0) - goto cleanup; - for (n =3D src; virStorageSourceIsBacking(n); n =3D n->backingStor= e) { if (!(backend =3D qemuBlockStorageSourceDetachPrepare(n, NULL)= )) goto cleanup; @@ -517,10 +506,6 @@ qemuHotplugDiskSourceAttachPrepare(virDomainDiskDefPtr= disk, return NULL; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && - !(data->corProps =3D qemuBlockStorageGetCopyOnReadProps(disk))) - goto cleanup; - for (n =3D src; virStorageSourceIsBacking(n); n =3D n->backingStor= e) { if (!(backend =3D qemuBlockStorageSourceAttachPrepareBlockdev(= n))) goto cleanup; @@ -577,9 +562,6 @@ qemuHotplugDiskSourceAttach(qemuMonitorPtr mon, return -1; } - if (data->corProps && - qemuMonitorAddObject(mon, &data->corProps, &data->corAlias) < 0) - return -1; return 0; } @@ -601,9 +583,6 @@ qemuHotplugDiskSourceRemove(qemuMonitorPtr mon, { size_t i; - if (data->corAlias) - ignore_value(qemuMonitorDelObject(mon, data->corAlias)); - for (i =3D 0; i < data->nbackends; i++) qemuBlockStorageSourceAttachRollback(mon, data->backends[i]); } @@ -812,6 +791,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, qemuHotplugDiskSourceDataPtr diskdata =3D NULL; char *devstr =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + VIR_AUTOPTR(virJSONValue) corProps =3D NULL; + VIR_AUTOFREE(char *)corAlias =3D NULL; if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0) goto cleanup; @@ -822,6 +803,12 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) goto error; + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && + !(corProps =3D qemuBlockStorageGetCopyOnReadProps(disk))) + goto cleanup; + } + if (!(diskdata =3D qemuHotplugDiskSourceAttachPrepare(disk, disk->src, priv->qemuCaps))) goto error; @@ -840,6 +827,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (qemuHotplugDiskSourceAttach(priv->mon, diskdata) < 0) goto exit_monitor; + if (corProps && + qemuMonitorAddObject(priv->mon, &corProps, &corAlias) < 0) + goto exit_monitor; + if (qemuDomainAttachExtensionDevice(priv->mon, &disk->info) < 0) goto exit_monitor; @@ -865,6 +856,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, return ret; exit_monitor: + if (corAlias) + ignore_value(qemuMonitorDelObject(priv->mon, corAlias)); qemuHotplugDiskSourceRemove(priv->mon, diskdata); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -4384,10 +4377,13 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk) { + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); qemuHotplugDiskSourceDataPtr diskbackend =3D NULL; virDomainDeviceDef dev; size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; + VIR_AUTOFREE(char *) corAlias =3D NULL; + bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); int ret =3D -1; VIR_DEBUG("Removing disk %s from domain %p %s", @@ -4397,6 +4393,11 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, priv->qemuCaps)= )) return -1; + if (blockdev) { + if (VIR_STRDUP(corAlias, diskPriv->nodeCopyOnRead) < 0) + goto cleanup; + } + for (i =3D 0; i < vm->def->ndisks; i++) { if (vm->def->disks[i] =3D=3D disk) { virDomainDiskRemove(vm->def, i); @@ -4406,6 +4407,9 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); + if (corAlias) + ignore_value(qemuMonitorDelObject(priv->mon, corAlias)); + qemuHotplugDiskSourceRemove(priv->mon, diskbackend); if (qemuDomainObjExitMonitor(driver, vm) < 0) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list