diff options
| author | Peter Maydell | 2020-09-29 11:29:46 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-09-29 11:29:46 +0200 |
| commit | 23290e8070fa18dd8ff930515326e76eeee5810a (patch) | |
| tree | 46313aa833315afb1f52a225711a385a7d4d76cd /python/qemu/machine.py | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200928-pull-request' ... (diff) | |
| parent | Revert "migration: Properly destroy variables on incoming side" (diff) | |
| download | qemu-23290e8070fa18dd8ff930515326e76eeee5810a.tar.gz qemu-23290e8070fa18dd8ff930515326e76eeee5810a.tar.xz qemu-23290e8070fa18dd8ff930515326e76eeee5810a.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200928a' into staging
Migration: Revert one patch for 068 fix
One patch in the last pull broke test 068 which
does a pair of vmload's.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Mon 28 Sep 2020 16:19:17 BST
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20200928a:
Revert "migration: Properly destroy variables on incoming side"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/qemu/machine.py')
0 files changed, 0 insertions, 0 deletions