]> git.proxmox.com Git - mirror_qemu.git/commit - qemu-img.c
block/snapshot: remove bdrv_snapshot_delete_by_id_or_name
authorDaniel Henrique Barboza <danielhb413@gmail.com>
Wed, 7 Nov 2018 13:09:59 +0000 (11:09 -0200)
committerKevin Wolf <kwolf@redhat.com>
Mon, 25 Feb 2019 14:03:18 +0000 (15:03 +0100)
commit8c04093c8ce13fb67122b4ecedaa9857dc8ada98
tree7a863fab6845d33c1a56ced84edf83eb9aa1e365
parent6ca080453ea403959ccde661030ca16264acc181
block/snapshot: remove bdrv_snapshot_delete_by_id_or_name

After the previous patch, the only instance of this function left
is inside qemu-img.c.

qemu-img is using it inside the 'img_snapshot' function to delete
snapshots in the SNAPSHOT_DELETE case, based on a "snapshot_name"
string that refers to the tag, not ID, of the QEMUSnapshotInfo struct.
This can be verified by checking the SNAPSHOT_CREATE case that
comes shortly before SNAPSHOT_DELETE. In that case, the same
"snapshot_name" variable is being strcpy to the 'name' field
of the QEMUSnapshotInfo struct sn:

pstrcpy(sn.name, sizeof(sn.name), snapshot_name);

Based on that, it is unlikely that "snapshot_name" might contain
an "id" in SNAPSHOT_DELETE.

This patch changes SNAPSHOT_DELETE to use snapshot_find() and
snapshot_delete() instead of bdrv_snapshot_delete_by_id_or_name.
After that, there is no instances left of bdrv_snapshot_delete_by_id_or_name
in the code, so it is safe to remove it entirely.

Suggested-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/snapshot.c
include/block/snapshot.h
qemu-img.c