From nobody Mon Sep 16 19:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1678722255; cv=none; d=zohomail.com; s=zohoarc; b=cE2OcPRBPw0VfAdxedtCv4kEVgQDsZDDGRl+uBz9NJ/kjEetoUboF+7hs91SfhApHZU3NeABHc22vE7Cr6ODDf4vj33jSneheywqRw3CUbdlW1is5VYZ4+GVq0/KSp/4KdjGO2Ouaeld3LMhx1w9QW5OGSgh9sw/PJOYh+At5ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678722255; 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=J2EphdGoA74wlgP9MixMPbNq5qRN2hFnO5foTffZbu8=; b=cEZ7eaoj6w0XXwHLeU9MWS4f6bCUbsN/kbpHdcRfe04jCoKmOIlC10lJLmECkBUv48w1xNp9M+Yz+3lmj8LSwPjUlfGMt2XbYR7aZki0ZuMNC/NdljyuZ6i/vxkbApPA7BkQRGuh644jjleLMPqCXy4v07NYU+wXAIaOJ/w9cnA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1678722255455730.5527433849251; Mon, 13 Mar 2023 08:44:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-583-3kieMTKpOUy9pFxvG_-e5A-1; Mon, 13 Mar 2023 11:43:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9B6622808E68; Mon, 13 Mar 2023 15:42:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 705CF2166B34; Mon, 13 Mar 2023 15:42:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1E76619465A3; Mon, 13 Mar 2023 15:42:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 194D91946594 for ; Mon, 13 Mar 2023 15:42:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0E5502166B29; Mon, 13 Mar 2023 15:42:39 +0000 (UTC) Received: from localhost.localdomain (unknown [10.45.226.242]) by smtp.corp.redhat.com (Postfix) with ESMTP id A285F2166B26 for ; Mon, 13 Mar 2023 15:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678722254; 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=J2EphdGoA74wlgP9MixMPbNq5qRN2hFnO5foTffZbu8=; b=b0K/ViQ7gDZLnlrOIeNn8b3yAN8qJUgkcNnK+t4lmz/aERG3KrTZJFdTP2+lyTOq8dwYmY Lfr3CGCfyeVnRot0980nR2GJnSi7N3yts8DZg6icxeBjPvGjP+ccpFGB0B4cZeZRCKt8mU URSa/MyKb2l9jrOeDmGrujDwkg2j0aw= X-MC-Unique: 3kieMTKpOUy9pFxvG_-e5A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 18/20] qemu_snapshot: check only once if snapshot is external Date: Mon, 13 Mar 2023 16:42:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678722257460100003 Content-Type: text/plain; charset="utf-8"; x-default="true" There will be more external snapshot checks introduced by following patch so group them together. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 95297cfe6a..05386b11fe 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -3426,18 +3426,18 @@ qemuSnapshotDeleteValidate(virDomainObj *vm, } } =20 - if (virDomainSnapshotIsExternal(snap) && - qemuDomainHasBlockjob(vm, false)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("cannot delete external snapshots when there is a= nother active block job")); - return -1; - } + if (virDomainSnapshotIsExternal(snap)) { + if (qemuDomainHasBlockjob(vm, false)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot delete external snapshots when there = is another active block job")); + return -1; + } =20 - if (virDomainSnapshotIsExternal(snap) && - (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("deletion of external disk snapshots with childre= n not supported")); - return -1; + if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("deletion of external disk snapshots with chi= ldren not supported")); + return -1; + } } =20 return 0; --=20 2.39.2