From nobody Mon Feb 9 07:05:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603298517; cv=none; d=zohomail.com; s=zohoarc; b=CrhOhgyYfWbUksXn+z3PO9qu3J0flCb6uzRNp6p6anusBDeBNB0DjQMxV3lf4vDjwDidf9o6tBDhRAQb2SWincsk6KGaG+eXM8bMYjY/XTY40th7OQlE8bgqQbh7+DzhxpzKKh6Ml3KjemQst+Qb3FSNww3iwxHYN0K/lYQuhNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603298517; h=Content-Type:Content-Transfer-Encoding:Cc: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=NmxLmJ7ZkwzAzWfasjsVkMb4P26pEX5CcOTwAqEfhDk=; b=BPACfVUWJzC8DV+EPidh9zM5evZ2Keo6SUfcdnazcIkDl7RMmspPJXmN4TYSajw/LEiiR+044fpn6YZQpsrjz4gaNsQIP5enARKqzBU4A+/2o1gxDzIDKaHgG0JDY8QlFSz7m9FfXPMtON/qzg9MMCaDFEcKoEjf/OekLVWRkh0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603298517069119.2360529236073; Wed, 21 Oct 2020 09:41:57 -0700 (PDT) Received: from localhost ([::1]:41744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVHBU-0002jk-0q for importer@patchew.org; Wed, 21 Oct 2020 12:41:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVGyJ-0002SA-3H for qemu-devel@nongnu.org; Wed, 21 Oct 2020 12:28:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVGy8-0004wR-JR for qemu-devel@nongnu.org; Wed, 21 Oct 2020 12:28:17 -0400 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-544-igqbVSSRNG-YgDgEiILHBQ-1; Wed, 21 Oct 2020 12:27:58 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0921E5F9D1; Wed, 21 Oct 2020 16:27:57 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0417610013C1; Wed, 21 Oct 2020 16:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603297680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NmxLmJ7ZkwzAzWfasjsVkMb4P26pEX5CcOTwAqEfhDk=; b=Jx5G9TfdW9eBrNTwmFJYULZb+SQR+GaCSjxF0RUjWbQRVmE8pWGZfh6vI0ovbkBjwRup0f MwZz1mqnFLzgJELvmbGpwKieSWkwh9KwhdcASAOD6y6lNryxxE9F4KeCT/j2pkNB4UghD9 VY4KEhRlxSzfNCsUV7XbM3CDyI027tc= X-MC-Unique: igqbVSSRNG-YgDgEiILHBQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 09/11] migration: introduce a delete_snapshot wrapper Date: Wed, 21 Oct 2020 17:27:02 +0100 Message-Id: <20201021162704.3652555-10-berrange@redhat.com> In-Reply-To: <20201021162704.3652555-1-berrange@redhat.com> References: <20201021162704.3652555-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 22:12:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Krempa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Denis V. Lunev" , qemu-block@nongnu.org, Juan Quintela , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Max Reitz , Pavel Dovgalyuk , Paolo Bonzini , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Make snapshot deletion consistent with the snapshot save and load commands by using a wrapper around the blockdev layer. The main difference is that we get upfront validation of the passed in device list (if any). Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/migration/snapshot.h | 13 +++++++++++++ migration/savevm.c | 14 ++++++++++++++ monitor/hmp-cmds.c | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h index 3bdbef435b..e72083b117 100644 --- a/include/migration/snapshot.h +++ b/include/migration/snapshot.h @@ -48,4 +48,17 @@ bool load_snapshot(const char *name, bool has_devices, strList *devices, Error **errp); =20 +/** + * delete_snapshot: Delete a snapshot. + * @name: path to snapshot + * @has_devices: whether to use explicit device list + * @devices: explicit device list to snapshot + * @errp: pointer to error object + * On success, return %true. + * On failure, store an error through @errp and return %false. + */ +bool delete_snapshot(const char *name, + bool has_devices, strList *devices, + Error **errp); + #endif diff --git a/migration/savevm.c b/migration/savevm.c index 59ad94ed14..303cbcb8ab 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2966,6 +2966,20 @@ err_drain: return false; } =20 +bool delete_snapshot(const char *name, bool has_devices, + strList *devices, Error **errp) +{ + if (!bdrv_all_can_snapshot(has_devices, devices, errp)) { + return false; + } + + if (bdrv_all_delete_snapshot(name, has_devices, devices, errp) < 0) { + return false; + } + + return true; +} + void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) { qemu_ram_set_idstr(mr->ram_block, diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index fdb8188e44..9c2fe40cf0 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1143,7 +1143,7 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) Error *err =3D NULL; const char *name =3D qdict_get_str(qdict, "name"); =20 - bdrv_all_delete_snapshot(name, false, NULL, &err); + delete_snapshot(name, false, NULL, &err); hmp_handle_error(mon, err); } =20 --=20 2.26.2