From nobody Mon Feb 9 00:55:52 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=1561390797; cv=none; d=zoho.com; s=zohoarc; b=as4/XjXL9zPKQv/MZNS34QsKPBuTrcl9ZXdB21a4MsaZzyubYP7JA7ENzDgVW+mrXfK7RtBafc0hs0YUBG6oycFYLA6ddn7m9pU5HSKhJY+uUHVv6rU3KqRGap0GyOzsCcIYe5BK/afk9rAuKNuGGe0M+fuQBWk+jjac7Fe1xoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561390797; 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=vZnI2kpGHMx4oc3lxkrUizyVIm+z6kbIRJywynLxWz4=; b=YdBYaLENxzx5dm5pi8A0cJdLUH492ntj15V4HDlIaZS4UBMBbfrqM9ejZphaazlHslo7gVb5DB9v3uOi3cffyjRWErJKO/5x9Xl2A8Yjj+tyGKlssJCqfVZ2i7I0qwslRpNWzC/XwxoyM438rnV7jHXM9rg+Cifc6lmu9QZPyJE= 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 1561390797996746.8682505420918; Mon, 24 Jun 2019 08:39:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 56E3578EC1; Mon, 24 Jun 2019 15:39:26 +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 06DF75D9D3; Mon, 24 Jun 2019 15:39:19 +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 A03EE1806B1A; Mon, 24 Jun 2019 15:39:09 +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 x5OFd2ok020880 for ; Mon, 24 Jun 2019 11:39:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id E07F35D961; Mon, 24 Jun 2019 15:39:02 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BED25D9C5 for ; Mon, 24 Jun 2019 15:39:02 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 24 Jun 2019 17:38:49 +0200 Message-Id: <0a89bfe2ea43c5140f2bebb33b163b2419ddc5df.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 04/10] qemu: command: Use storage chain helpers in commandline generator 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 24 Jun 2019 15:39:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Replace the open-coded local implementation with qemuBuildStorageSourceChainAttachPrepare(Drive|Blockdev). Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2a1d22eebf..acfec8a1bb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2559,11 +2559,8 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { - qemuBlockStorageSourceAttachDataPtr *data =3D NULL; - size_t ndata =3D 0; - VIR_AUTOPTR(qemuBlockStorageSourceAttachData) tmp =3D NULL; + VIR_AUTOPTR(qemuBlockStorageSourceChainData) data =3D NULL; virJSONValuePtr copyOnReadProps =3D NULL; - virStorageSourcePtr n; char *str =3D NULL; size_t i; int ret =3D -1; @@ -2574,35 +2571,21 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, goto cleanup; } - for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backi= ngStore) { - if (!(tmp =3D qemuBlockStorageSourceAttachPrepareBlockdev(n))) - goto cleanup; - - if (qemuBuildStorageSourceAttachPrepareCommon(n, tmp, qemuCaps= ) < 0) - goto cleanup; - - if (VIR_APPEND_ELEMENT(data, ndata, tmp) < 0) - goto cleanup; - } + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareBlockdev(di= sk->src, + qemu= Caps))) + goto cleanup; if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && !(copyOnReadProps =3D qemuBlockStorageGetCopyOnReadProps(disk)= )) goto cleanup; } else { - if (!(tmp =3D qemuBuildStorageSourceAttachPrepareDrive(disk, qemuC= aps))) - goto cleanup; - - if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, tmp, - qemuCaps) < 0) - goto cleanup; - - if (VIR_APPEND_ELEMENT(data, ndata, tmp) < 0) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk,= qemuCaps))) goto cleanup; } - for (i =3D ndata; i > 0; i--) { + for (i =3D data->nsrcdata; i > 0; i--) { if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd, - data[i - 1]) = < 0) + data->srcdata= [i - 1]) < 0) goto cleanup; } @@ -2617,9 +2600,6 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, ret =3D 0; cleanup: - for (i =3D 0; i < ndata; i++) - qemuBlockStorageSourceAttachDataFree(data[i]); - VIR_FREE(data); virJSONValueFree(copyOnReadProps); VIR_FREE(str); return ret; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list