From nobody Sat Feb 7 08:53:37 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=1623856033; cv=none; d=zohomail.com; s=zohoarc; b=jqPQmQW9ds3Wcz8ugkD0B0JdUZH8JmIcmMTqZlNDuWaFmV6dyw9vkE8kJ0XHGndW4eI37BlnjMYyyv5iz+qaA1MKcm6iHzmUH8jZHt1DLD+JwHq+JViCK2alwsPIcgR8xLeLteBtB5MC1QcI3zbBNXic4AYYbLDsrdYApSaA85Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623856033; 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=xRJ+fSjbaDLHCiUIu0FIr2L3Z7CDijLQfelpcGCGiDU=; b=YI6DLm7RrwEc2iB9580NW0AcQpYmNEMpSs7kxQ02eCC2VO52YRTVRLF2xdI/yzB6TT6OyT5rTuwtwIZrX0qfYz99y49hBuhRm0+u8niVZcTJWTPfJkBOYgP6d+lxxiw7Ixlr/R9wdTx4oVA0zo79vw4JB89eQLZ6pAJOfzPudCQ= 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 1623856033800897.9500580638011; Wed, 16 Jun 2021 08:07:13 -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-602-pfA6ebnCMUGdGz7zit-3uA-1; Wed, 16 Jun 2021 11:06:10 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB8598049D4; Wed, 16 Jun 2021 15:05:59 +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 97EF45DA27; Wed, 16 Jun 2021 15:05:59 +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 3411A1809CBC; Wed, 16 Jun 2021 15:05:59 +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 15GF5ntu012861 for ; Wed, 16 Jun 2021 11:05:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id B60945D9E3; Wed, 16 Jun 2021 15:05:49 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2114D5D9E2 for ; Wed, 16 Jun 2021 15:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623856031; 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=xRJ+fSjbaDLHCiUIu0FIr2L3Z7CDijLQfelpcGCGiDU=; b=MI/ffGJFGSRX6UpeAykCPpfmQ34RXS7wTeq4WtUS55uzssl88phcXtHWDIrx4/gGC/hiGn VMntBHMHzmulh7sHvuA1FwqLKNpx2vCHCtx+h2HOhkdMjndtohFMOBKdHK9Y9nUh+u069a YPRLuc9GCNCILUubMoRdgwukk2geOf8= X-MC-Unique: pfA6ebnCMUGdGz7zit-3uA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/7] qemuSnapshotPrepareDiskExternal: Refactor existing file check Date: Wed, 16 Jun 2021 17:05:35 +0200 Message-Id: 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.14 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" Use the snapshot disk type from the definition now that we validate that it matches. Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 96c43f69e7..dab386e455 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -607,10 +607,11 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, return -1; } - if (!S_ISBLK(st.st_mode) && st.st_size && !reuse) { + if (!reuse && + snapdisk->src->type =3D=3D VIR_STORAGE_TYPE_FILE && + st.st_size > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external snapshot file for disk %s alrea= dy " - "exists and is not a block device: %s"), + _("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