From nobody Mon Feb 9 16:02:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1583223609; cv=none; d=zohomail.com; s=zohoarc; b=QpcNZ9fABvNrqDpP4aCiVnwMxxJZ1ZVhkV/9wwIa2hnWhC73kYzE7WpGDCClIqwoBONveoekD1e7vzGBjIrnPH0d+Oh9Mt6HtV47YSaNOVArgmKi330d1PfNeWpefYQADj5FEETOSX/3b5qYXsUERWxCjfseRhH4mglEuBCtQkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583223609; 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=Ew++0t1pywe/LHmknCKf1n/Xf16TBQNczL7e8c2Iqgo=; b=P4wWxxpTVN7uOr5Fbn0jYbPjMuaTUBPFGu+Uk5zV4D0EQwlDSXdPOSndE0Xg8Y3J45Vafk73ODhzMeSJOXbyAJSdxJ5wyWOPGWlyRMk5XBkPQOfwiCJ4va1LnI8GMa8mx5s1JcQ3GqcXuviRRDtIaTWJILiHij4TmllQxlVo4VU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1583223609234118.75461375000293; Tue, 3 Mar 2020 00:20:09 -0800 (PST) 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-144-bjamGeubNFifdoypsH-54w-1; Tue, 03 Mar 2020 03:20:05 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3E0C800D50; Tue, 3 Mar 2020 08:19: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 7722E91D67; Tue, 3 Mar 2020 08:19: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 1DA5A18089D6; Tue, 3 Mar 2020 08:19:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0238JkeM003627 for ; Tue, 3 Mar 2020 03:19:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id A7E6310E60E6; Tue, 3 Mar 2020 08:19:46 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A2A4B1004C5A for ; Tue, 3 Mar 2020 08:19:44 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E078867B18 for ; Tue, 3 Mar 2020 08:19:44 +0000 (UTC) Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-170-QiexFCPOM_G82rVO2W-Gaw-1; Tue, 03 Mar 2020 03:19:42 -0500 Received: from dhcp-172-16-24-106.sw.ru ([172.16.24.106] helo=shiny.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1j92mB-0002uR-8A for libvir-list@redhat.com; Tue, 03 Mar 2020 11:19:39 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583223608; 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=Ew++0t1pywe/LHmknCKf1n/Xf16TBQNczL7e8c2Iqgo=; b=LDmCtKyh9vwXoAEgb1RJKvNjX/WXUDqAgoMuu+ycp6eFO0i0FtV92FCxmkAiYv4iaZa7vc ek2kd+/AIHvkDb1xd83l6ZCkQnJAq2UC8I14r8PWfWgwbneI66ETK41AP7sw8cFPmEFf0H hW0vHnjQ1EibhA2SnQ44PZhPhbq67Os= X-MC-Unique: bjamGeubNFifdoypsH-54w-1 X-MC-Unique: QiexFCPOM_G82rVO2W-Gaw-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 4/8] qemu: rename: support renaming checkpoints directory Date: Tue, 3 Mar 2020 11:19:18 +0300 Message-Id: <20200303081922.9157-5-nshirokovskiy@virtuozzo.com> In-Reply-To: <20200303081922.9157-1-nshirokovskiy@virtuozzo.com> References: <20200303081922.9157-1-nshirokovskiy@virtuozzo.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 0238JkeM003627 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.13 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: Nikolay Shirokovskiy --- src/qemu/qemu_checkpoint.c | 2 +- src/qemu/qemu_checkpoint.h | 6 ++++++ src/qemu/qemu_domain.c | 7 +++++++ src/qemu/qemu_driver.c | 23 +++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index c06bfe6a21..c13a005403 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -76,7 +76,7 @@ qemuCheckpointObjFromCheckpoint(virDomainObjPtr vm, } =20 =20 -static int +int qemuCheckpointWriteMetadata(virDomainObjPtr vm, virDomainMomentObjPtr checkpoint, virDomainXMLOptionPtr xmlopt, diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h index cf1e9e46cb..10e1198897 100644 --- a/src/qemu/qemu_checkpoint.h +++ b/src/qemu/qemu_checkpoint.h @@ -80,3 +80,9 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src, virJSONValuePtr actions, const char *diskdst, GSList **reopenimages); + +int +qemuCheckpointWriteMetadata(virDomainObjPtr vm, + virDomainMomentObjPtr checkpoint, + virDomainXMLOptionPtr xmlopt, + const char *checkpointDir); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0c4cb09158..45dbc1c7da 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -16732,10 +16732,12 @@ qemuDomainNamePathsCleanup(virQEMUDriverConfigPtr= cfg, g_autofree char *cfg_file =3D NULL; g_autofree char *autostart_link =3D NULL; g_autofree char *snap_dir =3D NULL; + g_autofree char *chk_dir =3D NULL; =20 cfg_file =3D virDomainConfigFile(cfg->configDir, name); autostart_link =3D virDomainConfigFile(cfg->autostartDir, name); snap_dir =3D g_strdup_printf("%s/%s", cfg->snapshotDir, name); + chk_dir =3D g_strdup_printf("%s/%s", cfg->checkpointDir, name); =20 if (virFileExists(cfg_file) && unlink(cfg_file) < 0) @@ -16754,5 +16756,10 @@ qemuDomainNamePathsCleanup(virQEMUDriverConfigPtr = cfg, return -1; } =20 + if (virFileIsDir(chk_dir) && virFileDeleteTree(chk_dir) < 0) { + if (reportError) + return -1; + } + return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6bde4d3de0..288067dd67 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -21962,6 +21962,24 @@ qemuDomainSnapshotWriteMetadataIter(void *payload, } =20 =20 +static int +qemuDomainCheckpointWriteMetadataIter(void *payload, + const void *name G_GNUC_UNUSED, + void *opaque) +{ + struct qemuDomainMomentWriteMetadataData *data =3D opaque; + virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(data->driver); + int ret; + + ret =3D qemuCheckpointWriteMetadata(data->vm, payload, + data->driver->xmlopt, + cfg->snapshotDir); + + virObjectUnref(cfg); + return ret; +} + + static int qemuDomainRenameCallback(virDomainObjPtr vm, const char *new_name, @@ -22027,6 +22045,11 @@ qemuDomainRenameCallback(virDomainObjPtr vm, &data) < 0) goto cleanup; =20 + if (virDomainCheckpointForEach(vm->checkpoints, + qemuDomainCheckpointWriteMetadataIter, + &data) < 0) + goto cleanup; + if (virDomainDefSave(vm->def, driver->xmlopt, cfg->configDir) < 0) goto cleanup; =20 --=20 2.23.0