[Qemu-commits] [qemu/qemu] 55a331: migration/colo: Minor fix for colo error message

2024-05-22 Thread Richard Henderson via Qemu-commits
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 55a331655dbc8feee198f379eaafa3e75e744b7b
  
https://github.com/qemu/qemu/commit/55a331655dbc8feee198f379eaafa3e75e744b7b
  Author: Li Zhijian 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/migration.c

  Log Message:
  ---
  migration/colo: Minor fix for colo error message

- Explicitly show the missing module name: replication
- Fix capability name to x-colo

Reviewed-by: Peter Xu 
Reviewed-by: Zhang Chen 
Signed-off-by: Li Zhijian 
Suggested-by: Michael Tokarev 
[fixed mangled author email address]
Signed-off-by: Fabiano Rosas 


  Commit: 787ea49e80df0e7af922586f6076da94410cdd08
  
https://github.com/qemu/qemu/commit/787ea49e80df0e7af922586f6076da94410cdd08
  Author: Li Zhijian 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M include/migration/colo.h
M migration/colo-stubs.c
M migration/colo.c
M migration/migration.c

  Log Message:
  ---
  migration/colo: make colo_incoming_co() return void

Currently, it always returns 0, no need to check the return value at all.
In addition, enter colo coroutine only if migration_incoming_colo_enabled()
is true.
Once the destination side enters the COLO* state, the COLO process will
take over the remaining processes until COLO exits.

Cc: Fabiano Rosas 
Reviewed-by: Peter Xu 
Reviewed-by: Zhang Chen 
Signed-off-by: Li Zhijian 
[fixed mangled author email address]
Signed-off-by: Fabiano Rosas 


  Commit: 3dc27fac2547623d837826bbda5369d7b240c78e
  
https://github.com/qemu/qemu/commit/3dc27fac2547623d837826bbda5369d7b240c78e
  Author: Li Zhijian 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/colo.c

  Log Message:
  ---
  migration/colo: Tidy up bql_unlock() around bdrv_activate_all()

Make the code more tight.

Suggested-by: Michael Tokarev 
Reviewed-by: Peter Xu 
Reviewed-by: Zhang Chen 
Signed-off-by: Li Zhijian 
Signed-off-by: Michael Tokarev 
[fixed mangled author email address]
Signed-off-by: Fabiano Rosas 


  Commit: 3f879f2f319379daeb65faa3677191ba4240b45c
  
https://github.com/qemu/qemu/commit/3f879f2f319379daeb65faa3677191ba4240b45c
  Author: Marc-André Lureau 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/trace-events
M migration/vmstate.c

  Log Message:
  ---
  migration: add "exists" info to load-state-field trace

Signed-off-by: Marc-André Lureau 
Reviewed-by: Peter Xu 
Reviewed-by: Fiona Ebner 
Tested-by: Fiona Ebner 
Signed-off-by: Fabiano Rosas 


  Commit: f0937ec669f9f39f5ece39f62d048606b9ee3877
  
https://github.com/qemu/qemu/commit/f0937ec669f9f39f5ece39f62d048606b9ee3877
  Author: Marc-André Lureau 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/vmstate.c

  Log Message:
  ---
  migration: fix a typo

Signed-off-by: Marc-André Lureau 
Reviewed-by: Peter Xu 
Reviewed-by: Fabiano Rosas 
Reviewed-by: Fiona Ebner 
Tested-by: Fiona Ebner 
Signed-off-by: Fabiano Rosas 


  Commit: 40a23ef643664b5c1021a9789f9d680b6294fb50
  
https://github.com/qemu/qemu/commit/40a23ef643664b5c1021a9789f9d680b6294fb50
  Author: Marc-André Lureau 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M hw/core/machine.c
M hw/display/virtio-gpu.c
M include/hw/virtio/virtio-gpu.h

  Log Message:
  ---
  virtio-gpu: fix v2 migration

Commit dfcf74fa ("virtio-gpu: fix scanout migration post-load") broke
forward/backward version migration. Versioning of nested VMSD structures
is not straightforward, as the wire format doesn't have nested
structures versions. Introduce x-scanout-vmstate-version and a field
test to save/load appropriately according to the machine version.

Fixes: dfcf74fa ("virtio-gpu: fix scanout migration post-load")
Signed-off-by: Marc-André Lureau 
Signed-off-by: Peter Xu 
Reviewed-by: Fiona Ebner 
Tested-by: Fiona Ebner 
[fixed long lines]
Signed-off-by: Fabiano Rosas 


  Commit: 9710401276a0eb2fc6d467d9abea1f5e3fe2c362
  
https://github.com/qemu/qemu/commit/9710401276a0eb2fc6d467d9abea1f5e3fe2c362
  Author: Fiona Ebner 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M hw/core/machine.c

  Log Message:
  ---
  hw/core/machine: move compatibility flags for VirtIO-net USO to machine 8.1

Migration from an 8.2 or 9.0 binary to an 8.1 binary with machine
version 8.1 can fail with:

> kvm: Features 0x1c0010130afffa7 unsupported. Allowed features: 0x10179bfffe7
> kvm: Failed to load virtio-net:virtio
> kvm: error while loading state for instance 0x0 of device 
> ':00:12.0/virtio-net'
> kvm: load of migration failed: Operation not permitted

The series

53da8b5a99 virtio-net: Add support for USO features
9da1684954 virtio-net: Add USO flags to vhost support.
f03e0cf63b tap: Add check for USO features
2ab0ec3121 tap: Add USO support to tap device.

only landed in QEMU 8.2, so the compatibility flags should be part of
machine 

[Qemu-commits] [qemu/qemu] 55a331: migration/colo: Minor fix for colo error message

2024-05-22 Thread Richard Henderson via Qemu-commits
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 55a331655dbc8feee198f379eaafa3e75e744b7b
  
https://github.com/qemu/qemu/commit/55a331655dbc8feee198f379eaafa3e75e744b7b
  Author: Li Zhijian 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/migration.c

  Log Message:
  ---
  migration/colo: Minor fix for colo error message

- Explicitly show the missing module name: replication
- Fix capability name to x-colo

Reviewed-by: Peter Xu 
Reviewed-by: Zhang Chen 
Signed-off-by: Li Zhijian 
Suggested-by: Michael Tokarev 
[fixed mangled author email address]
Signed-off-by: Fabiano Rosas 


  Commit: 787ea49e80df0e7af922586f6076da94410cdd08
  
https://github.com/qemu/qemu/commit/787ea49e80df0e7af922586f6076da94410cdd08
  Author: Li Zhijian 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M include/migration/colo.h
M migration/colo-stubs.c
M migration/colo.c
M migration/migration.c

  Log Message:
  ---
  migration/colo: make colo_incoming_co() return void

Currently, it always returns 0, no need to check the return value at all.
In addition, enter colo coroutine only if migration_incoming_colo_enabled()
is true.
Once the destination side enters the COLO* state, the COLO process will
take over the remaining processes until COLO exits.

Cc: Fabiano Rosas 
Reviewed-by: Peter Xu 
Reviewed-by: Zhang Chen 
Signed-off-by: Li Zhijian 
[fixed mangled author email address]
Signed-off-by: Fabiano Rosas 


  Commit: 3dc27fac2547623d837826bbda5369d7b240c78e
  
https://github.com/qemu/qemu/commit/3dc27fac2547623d837826bbda5369d7b240c78e
  Author: Li Zhijian 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/colo.c

  Log Message:
  ---
  migration/colo: Tidy up bql_unlock() around bdrv_activate_all()

Make the code more tight.

Suggested-by: Michael Tokarev 
Reviewed-by: Peter Xu 
Reviewed-by: Zhang Chen 
Signed-off-by: Li Zhijian 
Signed-off-by: Michael Tokarev 
[fixed mangled author email address]
Signed-off-by: Fabiano Rosas 


  Commit: 3f879f2f319379daeb65faa3677191ba4240b45c
  
https://github.com/qemu/qemu/commit/3f879f2f319379daeb65faa3677191ba4240b45c
  Author: Marc-André Lureau 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/trace-events
M migration/vmstate.c

  Log Message:
  ---
  migration: add "exists" info to load-state-field trace

Signed-off-by: Marc-André Lureau 
Reviewed-by: Peter Xu 
Reviewed-by: Fiona Ebner 
Tested-by: Fiona Ebner 
Signed-off-by: Fabiano Rosas 


  Commit: f0937ec669f9f39f5ece39f62d048606b9ee3877
  
https://github.com/qemu/qemu/commit/f0937ec669f9f39f5ece39f62d048606b9ee3877
  Author: Marc-André Lureau 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M migration/vmstate.c

  Log Message:
  ---
  migration: fix a typo

Signed-off-by: Marc-André Lureau 
Reviewed-by: Peter Xu 
Reviewed-by: Fabiano Rosas 
Reviewed-by: Fiona Ebner 
Tested-by: Fiona Ebner 
Signed-off-by: Fabiano Rosas 


  Commit: 40a23ef643664b5c1021a9789f9d680b6294fb50
  
https://github.com/qemu/qemu/commit/40a23ef643664b5c1021a9789f9d680b6294fb50
  Author: Marc-André Lureau 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M hw/core/machine.c
M hw/display/virtio-gpu.c
M include/hw/virtio/virtio-gpu.h

  Log Message:
  ---
  virtio-gpu: fix v2 migration

Commit dfcf74fa ("virtio-gpu: fix scanout migration post-load") broke
forward/backward version migration. Versioning of nested VMSD structures
is not straightforward, as the wire format doesn't have nested
structures versions. Introduce x-scanout-vmstate-version and a field
test to save/load appropriately according to the machine version.

Fixes: dfcf74fa ("virtio-gpu: fix scanout migration post-load")
Signed-off-by: Marc-André Lureau 
Signed-off-by: Peter Xu 
Reviewed-by: Fiona Ebner 
Tested-by: Fiona Ebner 
[fixed long lines]
Signed-off-by: Fabiano Rosas 


  Commit: 9710401276a0eb2fc6d467d9abea1f5e3fe2c362
  
https://github.com/qemu/qemu/commit/9710401276a0eb2fc6d467d9abea1f5e3fe2c362
  Author: Fiona Ebner 
  Date:   2024-05-22 (Wed, 22 May 2024)

  Changed paths:
M hw/core/machine.c

  Log Message:
  ---
  hw/core/machine: move compatibility flags for VirtIO-net USO to machine 8.1

Migration from an 8.2 or 9.0 binary to an 8.1 binary with machine
version 8.1 can fail with:

> kvm: Features 0x1c0010130afffa7 unsupported. Allowed features: 0x10179bfffe7
> kvm: Failed to load virtio-net:virtio
> kvm: error while loading state for instance 0x0 of device 
> ':00:12.0/virtio-net'
> kvm: load of migration failed: Operation not permitted

The series

53da8b5a99 virtio-net: Add support for USO features
9da1684954 virtio-net: Add USO flags to vhost support.
f03e0cf63b tap: Add check for USO features
2ab0ec3121 tap: Add USO support to tap device.

only landed in QEMU 8.2, so the compatibility flags should be part of
machine