Snapshot creation actually already distinguish id and name since it take a structured parameter *sn, but delete can't. Later an accurate delete is needed in qmp_transaction abort and blockdev-snapshot-delete-sync, so change its prototype. Also *errp is added to tip error, but return value is kepted to let caller check what kind of error happens. Existing caller for it are savevm, delvm and qemu-img, they are not impacted by introducing a new function bdrv_snapshot_delete_by_id_or_name(), which check the return value and do the operation again. Before this patch: For qcow2, it search id first then name to find the one to delete. For rbd, it search name. For sheepdog, it does nothing. After this patch: For qcow2, logic is the same by call it twice in caller. For rbd, it always fails in delete with id, but still search for name in second try, no change to user. Some code for *errp is based on Pavel's patch. Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
66 lines
2.9 KiB
C
66 lines
2.9 KiB
C
/*
|
|
* Block layer snapshot related functions
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef SNAPSHOT_H
|
|
#define SNAPSHOT_H
|
|
|
|
#include "qemu-common.h"
|
|
#include "qapi/error.h"
|
|
|
|
typedef struct QEMUSnapshotInfo {
|
|
char id_str[128]; /* unique snapshot id */
|
|
/* the following fields are informative. They are not needed for
|
|
the consistency of the snapshot */
|
|
char name[256]; /* user chosen name */
|
|
uint64_t vm_state_size; /* VM state info size */
|
|
uint32_t date_sec; /* UTC date of the snapshot */
|
|
uint32_t date_nsec;
|
|
uint64_t vm_clock_nsec; /* VM clock relative to boot */
|
|
} QEMUSnapshotInfo;
|
|
|
|
int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
|
|
const char *name);
|
|
bool bdrv_snapshot_find_by_id_and_name(BlockDriverState *bs,
|
|
const char *id,
|
|
const char *name,
|
|
QEMUSnapshotInfo *sn_info,
|
|
Error **errp);
|
|
int bdrv_can_snapshot(BlockDriverState *bs);
|
|
int bdrv_snapshot_create(BlockDriverState *bs,
|
|
QEMUSnapshotInfo *sn_info);
|
|
int bdrv_snapshot_goto(BlockDriverState *bs,
|
|
const char *snapshot_id);
|
|
int bdrv_snapshot_delete(BlockDriverState *bs,
|
|
const char *snapshot_id,
|
|
const char *name,
|
|
Error **errp);
|
|
void bdrv_snapshot_delete_by_id_or_name(BlockDriverState *bs,
|
|
const char *id_or_name,
|
|
Error **errp);
|
|
int bdrv_snapshot_list(BlockDriverState *bs,
|
|
QEMUSnapshotInfo **psn_info);
|
|
int bdrv_snapshot_load_tmp(BlockDriverState *bs,
|
|
const char *snapshot_name);
|
|
#endif
|