diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-14 16:33:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-14 16:33:23 +0100 |
| commit | beff47a2f6a8295161f98a9dac94e18e5376e749 (patch) | |
| tree | 001c6fb0929c3217fd556407f60ed642c7d31f58 /migration/savevm.c | |
| parent | 1a53dfee92284d3016a579ef31d53367e84d9dd8 (diff) | |
| parent | eb9bd46ff658e05e2c0c71fc308f3b811afa87e1 (diff) | |
| download | focaccia-qemu-beff47a2f6a8295161f98a9dac94e18e5376e749.tar.gz focaccia-qemu-beff47a2f6a8295161f98a9dac94e18e5376e749.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration-pull-request' into staging
Migration Pull request It includes several fixes: - fix qemu_fclose(denis) - remove superfluous breaks (liao) - fix memory leak (zheng) Please apply [v1 & v2] There was one error on the huawei address of the 1st patch and mail was bouncing. Fixed. # gpg: Signature made Mon 13 Jul 2020 18:51:34 BST # gpg: using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723 # gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full] # gpg: aka "Juan Quintela <quintela@trasno.org>" [full] # Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723 * remotes/juanquintela/tags/migration-pull-request: migration/migration.c: Remove superfluous breaks migration/savevm: respect qemu_fclose() error code in save_snapshot() migration: fix memory leak in qmp_migrate_set_parameters Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/savevm.c')
| -rw-r--r-- | migration/savevm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 6e01724605..45c9dd9d8a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2635,7 +2635,7 @@ int save_snapshot(const char *name, Error **errp) { BlockDriverState *bs, *bs1; QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1; - int ret = -1; + int ret = -1, ret2; QEMUFile *f; int saved_vm_running; uint64_t vm_state_size; @@ -2719,10 +2719,14 @@ int save_snapshot(const char *name, Error **errp) } ret = qemu_savevm_state(f, errp); vm_state_size = qemu_ftell(f); - qemu_fclose(f); + ret2 = qemu_fclose(f); if (ret < 0) { goto the_end; } + if (ret2 < 0) { + ret = ret2; + goto the_end; + } /* The bdrv_all_create_snapshot() call that follows acquires the AioContext * for itself. BDRV_POLL_WHILE() does not support nested locking because |