mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-09-04 08:09:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/juanquintela/tags/migration-20211106-pull-request' into staging

Browse Source 
Migration Pull request

- fix vhost-user crash when using postcopy (me)
- fix incorrect tag for docs (hyman)

Please apply, Juan.

# gpg: Signature made Sat 06 Nov 2021 07:29:37 PM EDT
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [full]

* remotes/juanquintela/tags/migration-20211106-pull-request:
  docs: fix qemu incorrect tag
  migration: Check that postcopy fd's are not NULL

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
2021-11-06 19:43:42 -04:00
parent c39deb2181 f78d4ed701
commit 63ed851de4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
migration/postcopy-ram.c
View File

@ -1457,6 +1457,10 @@ void postcopy_unregister_shared_ufd(struct PostCopyFD *pcfd)
MigrationIncomingState *mis = migration_incoming_get_current(); MigrationIncomingState *mis = migration_incoming_get_current();
GArray *pcrfds = mis->postcopy_remote_fds; GArray *pcrfds = mis->postcopy_remote_fds;
if (!pcrfds) {
/* migration has already finished and freed the array */
return;
}
for (i = 0; i < pcrfds->len; i++) { for (i = 0; i < pcrfds->len; i++) {
struct PostCopyFD *cur = &g_array_index(pcrfds, struct PostCopyFD, i); struct PostCopyFD *cur = &g_array_index(pcrfds, struct PostCopyFD, i);
if (cur->fd == pcfd->fd) { if (cur->fd == pcfd->fd) {

10
qapi/migration.json
View File

@ -1740,7 +1740,7 @@
# #
# @dirty-rate: dirty rate. # @dirty-rate: dirty rate.
# #
# Since: 6.1 # Since: 6.2
# #
## ##
{ 'struct': 'DirtyRateVcpu', { 'struct': 'DirtyRateVcpu',
@ -1774,7 +1774,7 @@
# #
# @dirty-bitmap: calculate dirtyrate by dirty bitmap. # @dirty-bitmap: calculate dirtyrate by dirty bitmap.
# #
# Since: 6.1 # Since: 6.2
# #
## ##
{ 'enum': 'DirtyRateMeasureMode', { 'enum': 'DirtyRateMeasureMode',
@ -1796,13 +1796,13 @@
# @calc-time: time in units of second for sample dirty pages # @calc-time: time in units of second for sample dirty pages
# #
# @sample-pages: page count per GB for sample dirty pages # @sample-pages: page count per GB for sample dirty pages
# the default value is 512 (since 6.1) # the default value is 512 (since 6.2)
# #
# @mode: mode containing method of calculate dirtyrate includes # @mode: mode containing method of calculate dirtyrate includes
# 'page-sampling' and 'dirty-ring' (Since 6.1) # 'page-sampling' and 'dirty-ring' (Since 6.2)
# #
# @vcpu-dirty-rate: dirtyrate for each vcpu if dirty-ring # @vcpu-dirty-rate: dirtyrate for each vcpu if dirty-ring
# mode specified (Since 6.1) # mode specified (Since 6.2)
# #
# Since: 5.2 # Since: 5.2
# #