]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/juanquintela/tags/migration-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 14 Jul 2020 15:33:23 +0000 (16:33 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 14 Jul 2020 15:33:23 +0000 (16:33 +0100)
commitbeff47a2f6a8295161f98a9dac94e18e5376e749
tree001c6fb0929c3217fd556407f60ed642c7d31f58
parent1a53dfee92284d3016a579ef31d53367e84d9dd8
parenteb9bd46ff658e05e2c0c71fc308f3b811afa87e1
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>