diff options
| author | Peter Maydell | 2020-07-04 16:05:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-04 16:05:43 +0200 |
| commit | 0b100c8e72c54bcd6f865d6570ffe838dafe7105 (patch) | |
| tree | f21dc8a9340ca9e01aaa046978b9f72e55fb1d80 /migration/postcopy-ram.c | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200703' into staging (diff) | |
| parent | migration: Count new_dirty instead of real_dirty (diff) | |
| download | qemu-0b100c8e72c54bcd6f865d6570ffe838dafe7105.tar.gz qemu-0b100c8e72c54bcd6f865d6570ffe838dafe7105.tar.xz qemu-0b100c8e72c54bcd6f865d6570ffe838dafe7105.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200703a' into staging
virtiofsd+migration pull 2020-07-03
A couple of small migration fixes, and some capability
rework for virtiofsd.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Fri 03 Jul 2020 16:26:35 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-20200703a:
migration: Count new_dirty instead of real_dirty
migration: postcopy take proper error return
virtiofsd: Allow addition or removal of capabilities
virtiofsd: Check capability calls
virtiofsd: Terminate capability list
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, 1 insertions, 1 deletions
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index a36402722b..bef2a3afed 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -389,7 +389,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis) */ if (munlockall()) { error_report("%s: munlockall: %s", __func__, strerror(errno)); - return -1; + goto out; } /* |