From nobody Sat Feb 7 08:53:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1623855972; cv=none; d=zohomail.com; s=zohoarc; b=ft3UgbfZhfPjc5EszDBWc27pgx31+J/TwKRKYMndeWpMhVcAvJae8mCF0r/RjRMm5JnDw5SeSjK+gSctU4YZ69riULbFujnYJ6u41jsLw6h/3ytpWFjz98bOJsdrcmQLKZFIrXgsYOfc9rDtuqEC11UfbcVwxYESA6nNDzKjD+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623855972; 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=edEbizXu+pzFcDWVJtjiJZBjcPk5fXq2r/fpgMgih14=; b=deBTr7Io9bxSYdZjfnvzk2LjEXbJMXV39x/6Ey3CA1lWgSAsjsfDltMZ8w+5g1gwwrixgpUiB5WBn8q3LFCaWiRxUtpvoZxevKwVBqviOJ1FKoTLwwinTPuglsG1G68k7u0sTVHjFODbGATAFLK0Gjjy1LyZ5a2d+Fh5nOKKNVE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623855972424758.9447026489268; Wed, 16 Jun 2021 08:06:12 -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-248-xdxAWQgbPKmtK8k26irN8Q-1; Wed, 16 Jun 2021 11:06:09 -0400 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 B1AA69127A; Wed, 16 Jun 2021 15:05:56 +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 9331D421F; Wed, 16 Jun 2021 15:05: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 59C7646F5A; Wed, 16 Jun 2021 15:05:56 +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 15GF5iNS012825 for ; Wed, 16 Jun 2021 11:05:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8BB585D9E2; Wed, 16 Jun 2021 15:05:44 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7BD25D9DE for ; Wed, 16 Jun 2021 15:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623855971; 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=edEbizXu+pzFcDWVJtjiJZBjcPk5fXq2r/fpgMgih14=; b=URTTidYURwq5CxJo0iTJbdjKMCfBSLZ3YC2JK4DfMovro7AFZERwltc9r+2k0pAT76Pkzq bPBPMtMuFtkCfTcM68dq2/fBfJXHUOG7TZNhMRawmJgFLDaTjyMSVE+Hs3cQCVlUKE0B9H QtplI6bhfi4t5+IwRv4aCpYLZFleWjA= X-MC-Unique: xdxAWQgbPKmtK8k26irN8Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/7] qemuSnapshotPrepareDiskExternal: Avoid condition squashing Date: Wed, 16 Jun 2021 17:05:32 +0200 Message-Id: <45bd48d3afb4630deaa6c50fb8a5ef65a0219f41.1623855902.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 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 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" Separate the 'else if' branches into nested conditions so that it's more obvious when we'll be adding additional checks later. Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 67180a2b10..81085bf4bd 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -582,18 +582,22 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, _("unable to stat for disk %s: %s"), snapdisk->name, snapdisk->src->path); return -1; - } else if (reuse) { + } + + if (reuse) { virReportSystemError(err, _("missing existing file for disk %s:= %s"), snapdisk->name, snapdisk->src->path); return -1; } - } else if (!S_ISBLK(st.st_mode) && st.st_size && !reuse) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external snapshot file for disk %s already " - "exists and is not a block device: %s"), - snapdisk->name, snapdisk->src->path); - return -1; + } else { + if (!S_ISBLK(st.st_mode) && st.st_size && !reuse) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("external snapshot file for disk %s alrea= dy " + "exists and is not a block device: %s"), + snapdisk->name, snapdisk->src->path); + return -1; + } } } --=20 2.31.1