mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
block: rename and alter bdrv_all_find_snapshot semantics
Currently bdrv_all_find_snapshot() will return 0 if it finds a snapshot, -1 if an error occurs, or if it fails to find a snapshot. New callers to be added want to distinguish between the error scenario and failing to find a snapshot. Rename it to bdrv_all_has_snapshot and make it return -1 on error, 0 if no snapshot is found and 1 if snapshot is found. Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20210204124834.774401-7-berrange@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
c22d644ca7
commit
3d3e9b1f66
5 changed files with 27 additions and 13 deletions
|
@ -143,6 +143,7 @@ static char *replay_find_nearest_snapshot(int64_t icount,
|
|||
QEMUSnapshotInfo *sn_tab;
|
||||
QEMUSnapshotInfo *nearest = NULL;
|
||||
char *ret = NULL;
|
||||
int rv;
|
||||
int nb_sns, i;
|
||||
AioContext *aio_context;
|
||||
|
||||
|
@ -159,7 +160,10 @@ static char *replay_find_nearest_snapshot(int64_t icount,
|
|||
aio_context_release(aio_context);
|
||||
|
||||
for (i = 0; i < nb_sns; i++) {
|
||||
if (bdrv_all_find_snapshot(sn_tab[i].name, false, NULL, NULL) == 0) {
|
||||
rv = bdrv_all_has_snapshot(sn_tab[i].name, false, NULL, NULL);
|
||||
if (rv < 0)
|
||||
goto fail;
|
||||
if (rv == 1) {
|
||||
if (sn_tab[i].icount != -1ULL
|
||||
&& sn_tab[i].icount <= icount
|
||||
&& (!nearest || nearest->icount < sn_tab[i].icount)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue