Migration Pull request

- fix vhost-user crash when using postcopy (me)
 - fix incorrect tag for docs (hyman)
 
 Please apply, Juan.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEGJn/jt6/WMzuA0uC9IfvGFhy1yMFAmGHD+EACgkQ9IfvGFhy
 1yMypxAAl3vLiZmmvla/Cln6cL/WhzS12QgAeCteIinNxV71vkAxz8b+bfCo9MMC
 mORh0uCZNpoX/iijJtM7pvhiAWACEY/80qGfdrpFZSbGexD5eQrar9rfUNjVvvm7
 OhXVP0Bk0mT2SRjXtOQAbagI6py03hX3ae5bGJU7v1dK2Rh8j/xY3CBzmBcfIi1X
 vbWhqpZO5Ji/S1ejk6y+fNaT/QH7oPUkzAAf/x1SDnS2TYp5oQjC3g/bmiWWkE0S
 XdLWoeyxy0HhSiEcz5dXpFqTioOJx/LtH7zg2nUt7q2t0zdNabh0008or0FDE2er
 LWSlvOjuSAtLiw209oLY1A6bLFSkeuR69nFSLJc1Z/Tr3uLk+U9gV3gBBz6cqWip
 uf2LOsDx5y/NRxSGk3oI7Rt16kAz9QGIKbgu1FS5izuGfuzLzflkBozg/aAsdDQl
 SDTJp2/sV/x6mS+U/WZOWh8SCHHce36qSFEvp2MkxoIPDJMiaVXcwlnMzNcVPOoC
 Kv6T3c4P61PsEeyfDAGufeZFa/RGNzxVkVK8jzpfGi4l9OrPnkFDP2tHXMvvjWte
 sK+3ueDV2UWuM19jb3VqUfuarHNtlX3l34YZjRmpJLsK2ORsGQrrQO/v0uXeRwep
 fIiCU8AnH2+yGcGTzP6zr8lIkk17d5aMjYNq/gvDwCWJQxZHZiU=
 =CGrl
 -----END PGP SIGNATURE-----

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

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>

migration/postcopy-ram.c

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

qapi/migration.json

@@ -1740,7 +1740,7 @@
 #
 # @dirty-rate: dirty rate.
 #
-# Since: 6.1
+# Since: 6.2
 #
 ##
 { 'struct': 'DirtyRateVcpu',
@@ -1774,7 +1774,7 @@
 #
 # @dirty-bitmap: calculate dirtyrate by dirty bitmap.
 #
-# Since: 6.1
+# Since: 6.2
 #
 ##
 { 'enum': 'DirtyRateMeasureMode',
@@ -1796,13 +1796,13 @@
 # @calc-time: time in units of second 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
-#        '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
-#                   mode specified (Since 6.1)
+#                   mode specified (Since 6.2)
 #
 # Since: 5.2
 #