From nobody Mon Feb 9 03:46:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1623856120; cv=none; d=zohomail.com; s=zohoarc; b=jdrQwZdZnt2bHDKNaACsJKusu0vrhP7VFErV5b4fM1ik2mdSQFMZf2IIFd3YGUagFj5pAiY5y/P/vzwfyL8auV5XoZqbnfX1P77EU0NXohrUgStTp4cm2PlFQg5ctToAYmGnSO+FDunHpuCI9a0QLgb9SBFW0Yx8fopx3vtOLyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623856120; 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=VHOGHUjtz3FCxRbDZNgwpSJtZPDOd4lbraOpE6seXLk=; b=NNls7P6CtKRcSRiS3xr0t/KGTXFJ98Vg5gPolipr1mRRPtsggim4mnYvZTuJL4O1kx0RVx1efd8ViM9oQ6dmR8tCc1+10cHnyrNQWVC9YUmvfa+6rHaVbgfjNUMw4NcRqXuPiTyJphJIMpQBmRKqcAP4/ZXppLpHGZXtxUC8hrg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623856120158269.8552240979059; Wed, 16 Jun 2021 08:08:40 -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-87-RiVGPA3qNEOzdybAcZxOIA-1; Wed, 16 Jun 2021 11:08:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C68841054F92; Wed, 16 Jun 2021 15:05:47 +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 915715C1D0; Wed, 16 Jun 2021 15:05:47 +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 3DB241809CAD; Wed, 16 Jun 2021 15:05:46 +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 15GF5hMj012816 for ; Wed, 16 Jun 2021 11:05:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 817CE5D9DE; Wed, 16 Jun 2021 15:05:43 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id E266C5D9E2 for ; Wed, 16 Jun 2021 15:05:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623856119; 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=VHOGHUjtz3FCxRbDZNgwpSJtZPDOd4lbraOpE6seXLk=; b=a+viY8aUek/wHB1YQ70hHQivGVs80BpSlf3Vq9AkqRSF6CG6SYEpcDk3/9o1UOeSjZ/RE5 lirg25dSR4zQ+WjODohNThojfR0/FYwmRLBrbJfL5SY6BA0wxcUHvGIMQntEJH5eoMqrbh ppnTtULbs1Va8exv90NH+//dGvJMX1A= X-MC-Unique: RiVGPA3qNEOzdybAcZxOIA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/7] qemuSnapshotPrepareDiskExternal: Move temp variables into the block using them Date: Wed, 16 Jun 2021 17:05:31 +0200 Message-Id: <274185ad92f4dd048a04cea05fc3f8ae9320ac3f.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.16 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" 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 29e86342d6..67180a2b10 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -541,9 +541,6 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, bool reuse, bool blockdev) { - struct stat st; - int err; - int rc; if (disk->src->readonly && !(reuse || blockdev)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -567,6 +564,10 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, } if (virStorageSourceIsLocalStorage(snapdisk->src)) { + struct stat st; + int err; + int rc; + if (virStorageSourceInit(snapdisk->src) < 0) return -1; --=20 2.31.1