Re: [PATCH 1/2] savevm: Remove dead code in save_snapshot()

[Denis V. Lunev]

On 12/17/20 6:27 PM, Dr. David Alan Gilbert wrote:
> * Tuguoyi (tu.guoyi@h3c.com) wrote:
>> The snapshot in each bs is deleted at the beginning, so there is no need
>> to find the snapshot again.
>>
>> Signed-off-by: Tuguoyi <tu.guoyi@h3c.com>
> This looks OK to me, becoming redundant after Denis's 0b46160 - but
> I don't know the snapshot code much;
>
> Denis - do you agree this is correct?

For me it looks too that the code becomes redundant, thus

Reviewed-by: Denis V. Lunev <den@openvz.org>

> Dave
>
>> ---
>>  migration/savevm.c | 10 ++--------
>>  1 file changed, 2 insertions(+), 8 deletions(-)
>>
>> diff --git a/migration/savevm.c b/migration/savevm.c
>> index 5f937a2..601b514 100644
>> --- a/migration/savevm.c
>> +++ b/migration/savevm.c
>> @@ -2728,7 +2728,7 @@ int qemu_load_device_state(QEMUFile *f)
>>  int save_snapshot(const char *name, Error **errp)
>>  {
>>      BlockDriverState *bs, *bs1;
>> -    QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;
>> +    QEMUSnapshotInfo sn1, *sn = &sn1;
>>      int ret = -1, ret2;
>>      QEMUFile *f;
>>      int saved_vm_running;
>> @@ -2797,13 +2797,7 @@ int save_snapshot(const char *name, Error **errp)
>>      }
>>  
>>      if (name) {
>> -        ret = bdrv_snapshot_find(bs, old_sn, name);
>> -        if (ret >= 0) {
>> -            pstrcpy(sn->name, sizeof(sn->name), old_sn->name);
>> -            pstrcpy(sn->id_str, sizeof(sn->id_str), old_sn->id_str);
>> -        } else {
>> -            pstrcpy(sn->name, sizeof(sn->name), name);
>> -        }
>> +        pstrcpy(sn->name, sizeof(sn->name), name);
>>      } else {
>>          /* cast below needed for OpenBSD where tv_sec is still 'long' */
>>          localtime_r((const time_t *)&tv.tv_sec, &tm);
>> -- 
>> 2.7.4
>>