From nobody Mon Feb 9 04:45:19 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=1561391020; cv=none; d=zoho.com; s=zohoarc; b=lCUBMfIN94EFKD82KA9W1ZLDef8EzhTj6KsvCIJzZE57IZFxalPyY7/i9YBWq3HKPNNq3sDkIpUtBuBrCMgAL5+wfMdo/eiXSk+pelKsCQvpsv8mvLd+R0tRVpJkM3VLGnGQ5itG5FYUcT/CjZKtXeqpBDIdfMJSJ0CXkBPyVw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561391020; 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=nr/DgiqGC9gaXMDyv5fXZD2JPCK8QIH+/RAO9ooW2AY=; b=nCZ6j9ONArvATBKCS/tAlDS2ZffoKr0W2wG4O+vh5RQyCFXaKr2wmV0x8rSUgEOKUJcxIoegTmuX6nQedMgkPvxjnowrQp+4kgFKz7ApBdQKsfx5j5zEdjeMpMI2YKQM3cW/BpJgG97Hopdmf2xLU6+sXcONqwGOU4hliZS3G7g= 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 1561391020151120.79247625576158; Mon, 24 Jun 2019 08:43:40 -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 7F710C066462; Mon, 24 Jun 2019 15:43:38 +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 582435D9D3; Mon, 24 Jun 2019 15:43:38 +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 09FBE1806B1B; Mon, 24 Jun 2019 15:43:38 +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 x5OFd4JO020931 for ; Mon, 24 Jun 2019 11:39:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7760C5D9DE; Mon, 24 Jun 2019 15:39:04 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02D665D9C5 for ; Mon, 24 Jun 2019 15:39:03 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 24 Jun 2019 17:38:51 +0200 Message-Id: <96c68cc3f22992cc42c6a6e8aba91ff0bb3c115b.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 06/10] qemu: command: get rid of 'cleanup' in qemuBuildDiskSourceCommandLine 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.31]); Mon, 24 Jun 2019 15:43:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1ae8a00352..7a7497686a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2563,43 +2563,37 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, VIR_AUTOPTR(virJSONValue) copyOnReadProps =3D NULL; VIR_AUTOFREE(char *) copyOnReadPropsStr =3D NULL; size_t i; - int ret =3D -1; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virStorageSourceIsEmpty(disk->src)) { - ret =3D 0; - goto cleanup; - } + if (virStorageSourceIsEmpty(disk->src)) + return 0; if (!(data =3D qemuBuildStorageSourceChainAttachPrepareBlockdev(di= sk->src, qemu= Caps))) - goto cleanup; + return -1; if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && !(copyOnReadProps =3D qemuBlockStorageGetCopyOnReadProps(disk)= )) - goto cleanup; + return -1; } else { if (!(data =3D qemuBuildStorageSourceChainAttachPrepareDrive(disk,= qemuCaps))) - goto cleanup; + return -1; } for (i =3D data->nsrcdata; i > 0; i--) { if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd, data->srcdata= [i - 1]) < 0) - goto cleanup; + return -1; } if (copyOnReadProps) { if (!(copyOnReadPropsStr =3D virJSONValueToString(copyOnReadProps,= false))) - goto cleanup; + return -1; virCommandAddArgList(cmd, "-blockdev", copyOnReadPropsStr, NULL); } - ret =3D 0; - - cleanup: - return ret; + return 0; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list