diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-02 20:29:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-02 20:29:50 +0000 |
| commit | 8545ae485b1e8e43cc0137310c4c68dbece59990 (patch) | |
| tree | e5c7a35c156719ca8a7e342e2f94746c00c3f171 /migration/postcopy-ram.c | |
| parent | 8680d6e36468f1ca00e2fe749bef50585d632401 (diff) | |
| parent | af1bb3fe7f146fafdaadb479975ca2b53b49df40 (diff) | |
| download | qemu-8545ae485b1e8e43cc0137310c4c68dbece59990.zip qemu-8545ae485b1e8e43cc0137310c4c68dbece59990.tar.gz qemu-8545ae485b1e8e43cc0137310c4c68dbece59990.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20201102a' into staging
Migration and virtiofs fixes 2020-11-02
Fixes for postcopy migration test hang
A seccomp crash for virtiofsd on some !x86
Help message and minor CID fix
And another crack at Max's set.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Mon 02 Nov 2020 19:54:59 GMT
# 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-20201102a:
tests/acceptance: Add virtiofs_submounts.py
tests/acceptance/boot_linux: Accept SSH pubkey
virtiofsd: Announce sub-mount points
virtiofsd: Add mount ID to the lo_inode key
meson.build: Check for statx()
virtiofsd: Add attr_flags to fuse_entry_param
virtiofsd: Check FUSE_SUBMOUNTS
virtiofsd: Fix the help message of posix lock
tools/virtiofsd: Check vu_init() return value (CID 1435958)
virtiofsd: Seccomp: Add 'send' for syslog
migration: Postpone the kick of the fault thread after recover
migration: Unify reset of last_rb on destination node when recover
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/postcopy-ram.c')
| -rw-r--r-- | migration/postcopy-ram.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index d3bb3a7..d99842e 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -903,7 +903,6 @@ static void *postcopy_ram_fault_thread(void *opaque) * the channel is rebuilt. */ if (postcopy_pause_fault_thread(mis)) { - mis->last_rb = NULL; /* Continue to read the userfaultfd */ } else { error_report("%s: paused but don't allow to continue", @@ -985,7 +984,6 @@ retry: /* May be network failure, try to wait for recovery */ if (ret == -EIO && postcopy_pause_fault_thread(mis)) { /* We got reconnected somehow, try to continue */ - mis->last_rb = NULL; goto retry; } else { /* This is a unavoidable fault */ |