[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/15] savevm: Remove dead code in save_snapshot()
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 13/15] savevm: Remove dead code in save_snapshot() |
Date: |
Fri, 18 Dec 2020 10:41:15 +0000 |
From: Tuguoyi <tu.guoyi@h3c.com>
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>
Message-Id: <1607410416-13563-2-git-send-email-tu.guoyi@h3c.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/savevm.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 5f937a2762..601b5144b8 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.29.2
- [PULL 02/15] monitor:braces {} are necessary for all arms of this statement, (continued)
- [PULL 02/15] monitor:braces {} are necessary for all arms of this statement, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 03/15] monitor:Don't use '#' flag of printf format ('%#') in format strings, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 05/15] virtiofsd: Use --thread-pool-size=0 to mean no thread pool, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 04/15] hmp-commands.hx: List abbreviation after command for cont, quit, print, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 06/15] virtiofsd: make the debug log timestamp on stderr more human-readable, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 07/15] virtiofsd: Set up posix_lock hash table for root inode, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 08/15] virtiofsd: Disable posix_lock hash table if remote locks are not enabled, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 09/15] virtiofsd: Check file type in lo_flush(), Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 10/15] virtiofsd: update FUSE_FORGET comment on "lo_inode.nlookup", Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 11/15] virtiofsd: Remove useless code about send_notify_iov, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 13/15] savevm: Remove dead code in save_snapshot(),
Dr. David Alan Gilbert (git) <=
- [PULL 12/15] docs/devel/migration: Improve debugging section a bit, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 14/15] savevm: Delete snapshots just created in case of error, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 15/15] migration: Don't allow migration if vm is in POSTMIGRATE, Dr. David Alan Gilbert (git), 2020/12/18
- Re: [PULL 00/15] migration queue, Peter Maydell, 2020/12/31