From nobody Mon Feb 9 07:07:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1579795065; cv=none; d=zohomail.com; s=zohoarc; b=iwQa6EgbGXN+eiXbRZgxsDDOFkvkb1cI6QZ7sX6VptmMYRqVIbrhBGxT4anAOX4YgejFxDns9GBsa++KPe9Zf50HvvS/YoEKJxaGMcUgpTth4w8OWqtMlx1CZ4fgd2vtnxc2y3gbjKOojrUyyqmqIcCtEDEoYLFCc6T1gV9MfwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579795065; h=Content-Type:Content-Transfer-Encoding:Cc: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=C3S/9f8YoOIsPW/WD0hf5wD6guPToKptfqvLEvRj4uI=; b=JmcyrURlGfmD6U56iLVrUZnYuXtCgFVcZ8bnTH5oN1CIu0sUQbrarqym12h4YrmyFEBPK2P9SsW+sbFy21AvCW8KKWGIbvlf1sHtA/rfLPaZ0e9b9/uOVWeO7IL7PBLJAgB6sVHMS15M/LWmd9SmLXlyYBZpY1QBvaKlxsWN50U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1579795065881943.26111344261; Thu, 23 Jan 2020 07:57:45 -0800 (PST) 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-68-0HsSuLECMwKQ6RZCD_jiYQ-1; Thu, 23 Jan 2020 10:57:41 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D7067DBA3; Thu, 23 Jan 2020 15:57:35 +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 A2BCC85753; Thu, 23 Jan 2020 15:57:35 +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 4FF978594A; Thu, 23 Jan 2020 15:57:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00NFvHXB012669 for ; Thu, 23 Jan 2020 10:57:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id B51B938F; Thu, 23 Jan 2020 15:57:17 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16C8919C69; Thu, 23 Jan 2020 15:57:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579795063; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=C3S/9f8YoOIsPW/WD0hf5wD6guPToKptfqvLEvRj4uI=; b=WXoucbnzFnyPNUnFtZa4Q3cgj0/hkE2Psvdd6kHxleD7R5oQzPJ7CLMQEGKDgsuAHZPxjo jA4iSBDD+76oWRSz36ilNff/mzjXbzQlD4lBERqmAuZ9n0EO8j5h4WMN17OaRhJt5l0Qff 9RDY/KdVkkWq2HXhmFSAQwXOcwOQfZ0= From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] qemu: Fix value of 'device' argument for block-commit Date: Thu, 23 Jan 2020 16:57:05 +0100 Message-Id: <68e9eb39123199808c40ad7d4498fb588b0bcca6.1579794423.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Peter Krempa 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.11 X-MC-Unique: 0HsSuLECMwKQ6RZCD_jiYQ-1 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" When using blockdev configurations the 'device' argument of 'blockdev-commit' must correspond to the topmost node in the block node graph. Libvirt didn't do this properly in case when 'copy_on_read' option was enabled on the disk. Use qemuDomainDiskGetTopNodename to fix it when calling block-commit. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9e2a94306c..0b23c747ce 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18813,7 +18813,7 @@ qemuDomainBlockCommit(virDomainPtr dom, jobname =3D job->name; nodetop =3D topSource->nodeformat; nodebase =3D baseSource->nodeformat; - device =3D disk->src->nodeformat; + device =3D qemuDomainDiskGetTopNodename(disk); if (!backingPath && top_parent && !(backingPath =3D qemuBlockGetBackingStoreString(baseSource))) goto endjob; --=20 2.24.1