From nobody Mon Feb 9 08:59:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1621601302; cv=none; d=zohomail.com; s=zohoarc; b=L3K8JyqQT8zrvWlyohoNOJ+lX6F9x36lZ9PSiIpkbNNIU/nsfymYXiwxASO/B0CMXPRYPOdlivtqlDJRH5CNS4YL7l5b4oRA96XUyKeStxgn8KXhEIkuCQMYH0diWcS6T2tifX4uJmsmW532Am+uwPA0lqf2o2d3OFi59lP65Yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621601302; 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; bh=wxxULADm1u4Sq/K/n/GprItMFegRDWo375/DIglVqVc=; b=GjJS2Xr8roXyOGk2jG2vg2507PKtOcJSFfM+LbQjLPhzld+D1tdgzMGmmmdxa8tstrlHrM0umdtIQsfpnqvBjosoTh3oSFmxPo4WjXnAQQmG9n5QDYnOeqCBvaQ/Nfra+iuYZ0tUoUqEkhlsb7E/d/Owh/sxNmTFjxV5XQaf7XE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621601302332264.96229685190303; Fri, 21 May 2021 05:48:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-15--Z8WoiSePMW5g9bMR-4oZg-1; Fri, 21 May 2021 08:48:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA04791271; Fri, 21 May 2021 12:48:11 +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 8311769324; Fri, 21 May 2021 12:48:11 +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 091771801268; Fri, 21 May 2021 12:48:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14LCm7ti031162 for ; Fri, 21 May 2021 08:48:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id E95C41964B; Fri, 21 May 2021 12:48:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46781421F for ; Fri, 21 May 2021 12:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621601301; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=wxxULADm1u4Sq/K/n/GprItMFegRDWo375/DIglVqVc=; b=cKLz5YrVdTEhQJTHP4vWZ+vx/2MsrEbEgrBt0XqF7fUHBMhO+kpYoUNSYndhs5s6WM4+5H Hzg2dGEDxiyFT4LQMqnIx/9Ve4t42Abb3p920BbnWiVZNskb4b5RCneJ8H0RNNNVqY8Ajf 8erViQQ0jPAO3TKDiOfvTTMtGPx7ZXg= X-MC-Unique: -Z8WoiSePMW5g9bMR-4oZg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/35] qemuDomainAttachDiskGeneric: Move 'copy-on-read' handling to qemuBlockStorageSourceChainData Date: Fri, 21 May 2021 14:47:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Fill in the required fields in qemuBlockStorageSourceChainData to handle the hotplug so that we can simplify the cleanup code. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_hotplug.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ee72762d0d..31dc9a43b2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -700,9 +700,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; g_autofree char *devstr =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - g_autoptr(virJSONValue) corProps =3D NULL; - g_autofree char *corAlias =3D NULL; - bool corAdded =3D false; bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0) @@ -718,16 +715,17 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev(dis= k))) goto cleanup; } else if (blockdev) { + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareBlockdev(di= sk->src, + priv= ->qemuCaps))) + goto cleanup; + if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON) { - if (!(corProps =3D qemuBlockStorageGetCopyOnReadProps(disk))) + if (!(data->copyOnReadProps =3D qemuBlockStorageGetCopyOnReadP= rops(disk))) goto cleanup; - corAlias =3D g_strdup(QEMU_DOMAIN_DISK_PRIVATE(disk)->nodeCopy= OnRead); + data->copyOnReadNodename =3D g_strdup(QEMU_DOMAIN_DISK_PRIVATE= (disk)->nodeCopyOnRead); } - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareBlockdev(di= sk->src, - priv= ->qemuCaps))) - goto cleanup; } else { if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk, priv->q= emuCaps))) @@ -746,13 +744,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, if (qemuBlockStorageSourceChainAttach(priv->mon, data) < 0) goto exit_monitor; - if (corProps) { - if (qemuMonitorBlockdevAdd(priv->mon, &corProps) < 0) - goto exit_monitor; - - corAdded =3D true; - } - if (qemuDomainAttachExtensionDevice(priv->mon, &disk->info) < 0) goto exit_monitor; @@ -793,8 +784,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, return ret; exit_monitor: - if (corAdded) - ignore_value(qemuMonitorBlockdevDel(priv->mon, corAlias)); qemuBlockStorageSourceChainDetach(priv->mon, data); if (qemuDomainObjExitMonitor(driver, vm) < 0) --=20 2.31.1