Fixes: 44adb5fcc20d "target/riscv: Remove spike as default machine"
Fixes: 48814111366b "migration: Always set DEVICE state"
Fixes: 3345fb3b6d7f "migration/postcopy: Add latency distribution report for blocktime"
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 docs/about/removed-features.rst | 2 +-
 migration/migration.c           | 2 +-
 qapi/migration.json             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index f7a2aa326de..0735b4ea1d5 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1241,7 +1241,7 @@ RISC-V default machine (removed in 11.1)
 ''''''''''''''''''''''''''''''''''''''''
 
 RISC-V used to define ``spike`` as the default machine if no machine option
-was given via the command line.  This happend because ``spike`` was the first
+was given via the command line.  This happened because ``spike`` was the first
 RISC-V machine implemented in QEMU and setting it as default was
 convenient at that time.  Now we have 7 riscv64 and 6 riscv32 machines
 and having ``spike`` as a default is no longer justified.
diff --git a/migration/migration.c b/migration/migration.c
index 9736c14458b..9df6da131ce 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2806,7 +2806,7 @@ static bool migration_switchover_prepare(MigrationState *s)
     bql_lock();
     /*
      * After BQL released and retaken, the state can be CANCELLING if it
-     * happend during sem_wait().. Only change the state if it's still
+     * happened during sem_wait().. Only change the state if it's still
      * pre-switchover.
      */
     migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER,
diff --git a/qapi/migration.json b/qapi/migration.json
index 66bd900465a..802474750b5 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -270,7 +270,7 @@
 #     (Since 10.1)
 #
 # @postcopy-non-vcpu-latency: average remote page fault latency for
-#     all faults happend in non-vCPU threads (in ns).  It has the same
+#     all faults happened in non-vCPU threads (in ns).  It has the same
 #     definition of @postcopy-latency but this only provides
 #     statistics to non-vCPU faults.  This is only present when the
 #     postcopy-blocktime migration capability is enabled.
-- 
2.47.3

On 7/16/26 09:34, Michael Tokarev wrote:

> diff --git a/qapi/migration.json b/qapi/migration.json
> index 66bd900465a..802474750b5 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -270,7 +270,7 @@
>   #     (Since 10.1)
>   #
>   # @postcopy-non-vcpu-latency: average remote page fault latency for
> -#     all faults happend in non-vCPU threads (in ns).  It has the same
> +#     all faults happened in non-vCPU threads (in ns).  It has the same
>   #     definition of @postcopy-latency but this only provides

This doesn't work, - it fails to build due to too long line, so
line re-wrapping is also needed.  The correct(ed) version is:

--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -270,8 +270,8 @@
  #     (Since 10.1)
  #
  # @postcopy-non-vcpu-latency: average remote page fault latency for
-#     all faults happend in non-vCPU threads (in ns).  It has the same
-#     definition of @postcopy-latency but this only provides
+#     all faults happened in non-vCPU threads (in ns).  It has the
+#     same definition of @postcopy-latency but this only provides
  #     statistics to non-vCPU faults.  This is only present when the
  #     postcopy-blocktime migration capability is enabled.
  #     (Since 10.1)

Thanks,

/mjt

On 16/7/26 10:06, Michael Tokarev wrote:
> On 7/16/26 09:34, Michael Tokarev wrote:
> 
>> diff --git a/qapi/migration.json b/qapi/migration.json
>> index 66bd900465a..802474750b5 100644
>> --- a/qapi/migration.json
>> +++ b/qapi/migration.json
>> @@ -270,7 +270,7 @@
>>   #     (Since 10.1)
>>   #
>>   # @postcopy-non-vcpu-latency: average remote page fault latency for
>> -#     all faults happend in non-vCPU threads (in ns).  It has the same
>> +#     all faults happened in non-vCPU threads (in ns).  It has the same
>>   #     definition of @postcopy-latency but this only provides
> 
> This doesn't work, - it fails to build due to too long line, so
> line re-wrapping is also needed.  The correct(ed) version is:
> 
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -270,8 +270,8 @@
>   #     (Since 10.1)
>   #
>   # @postcopy-non-vcpu-latency: average remote page fault latency for
> -#     all faults happend in non-vCPU threads (in ns).  It has the same
> -#     definition of @postcopy-latency but this only provides
> +#     all faults happened in non-vCPU threads (in ns).  It has the
> +#     same definition of @postcopy-latency but this only provides
>   #     statistics to non-vCPU faults.  This is only present when the
>   #     postcopy-blocktime migration capability is enabled.
>   #     (Since 10.1)

Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>