[Qemu-commits] [qemu/qemu] 60dbc5: vl: add qemu_add_vm_change_state_handler_prio()

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 60dbc5a1c5176269669ffc26c081ab2cfb7f12f7
      
https://github.com/qemu/qemu/commit/60dbc5a1c5176269669ffc26c081ab2cfb7f12f7
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  vl: add qemu_add_vm_change_state_handler_prio()

Add an API for registering vm change state handlers with a well-defined
ordering.  This is necessary when handlers depend on each other.

Small coding style fixes are included to make checkpatch.pl happy.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: e965ffa70ac8ddc334dd5990f6907789bd9e6af6
      
https://github.com/qemu/qemu/commit/e965ffa70ac8ddc334dd5990f6907789bd9e6af6
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M hw/core/Makefile.objs
    A hw/core/vm-change-state-handler.c
    M include/hw/qdev-core.h

  Log Message:
  -----------
  qdev: add qdev_add_vm_change_state_handler()

Children sometimes depend on their parent's vm change state handler
having completed.  Add a vm change state handler API for devices that
guarantees tree depth ordering.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 1a8c091c4ea5db3126514e3f7df678c9ee328802
      
https://github.com/qemu/qemu/commit/1a8c091c4ea5db3126514e3f7df678c9ee328802
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M hw/virtio/virtio.c

  Log Message:
  -----------
  virtio-scsi: restart DMA after iothread

When the 'cont' command resumes guest execution the vm change state
handlers are invoked.  Unfortunately there is no explicit ordering
between classic qemu_add_vm_change_state_handler() callbacks.  When two
layers of code both use vm change state handlers, we don't control which
handler runs first.

virtio-scsi with iothreads hits a deadlock when a failed SCSI command is
restarted and completes before the iothread is re-initialized.

This patch uses the new qdev_add_vm_change_state_handler() API to
guarantee that virtio-scsi's virtio change state handler executes before
the SCSI bus children.  This way DMA is restarted after the iothread has
re-initialized.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 197bfa7da7c8eeb39aa50cd120cd1a9df9704878
      
https://github.com/qemu/qemu/commit/197bfa7da7c8eeb39aa50cd120cd1a9df9704878
  Author: John Snow <address@hidden>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M block/qcow.c

  Log Message:
  -----------
  block/qcow: Improve error when opening qcow2 files as qcow

Reported-by: address@hidden
Fixes: https://bugs.launchpad.net/bugs/1832914
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 2bbd998642419bd5415c8d4e4d49c6da5cfd1a78
      
https://github.com/qemu/qemu/commit/2bbd998642419bd5415c8d4e4d49c6da5cfd1a78
  Author: Jason Dillaman <address@hidden>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: update RBD block maintainer

Remove Josh as per his request since he is no longer the upstream RBD
tech lead. Add myself as the maintainer since I am the current RBD tech
lead.

Signed-off-by: Jason Dillaman <address@hidden>
Reviewed-by: Josh Durgin <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f7077c9860a438087c2d9a8cc27cb8438c98a748
      
https://github.com/qemu/qemu/commit/f7077c9860a438087c2d9a8cc27cb8438c98a748
  Author: Eric Blake <address@hidden>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Allow -o compat=v3 during qemu-img amend

Commit b76b4f60 allowed '-o compat=v3' as an alias for the
less-appealing '-o compat=1.1' for 'qemu-img create' since we want to
use the QMP form as much as possible, but forgot to do likewise for
qemu-img amend.  Also, it doesn't help that '-o help' doesn't list our
new preferred spellings.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a4efdb6b24dceccd97f0a615a1752eb6fb92d46b
      
https://github.com/qemu/qemu/commit/a4efdb6b24dceccd97f0a615a1752eb6fb92d46b
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-08 (Mon, 08 Jul 2019)

  Changed paths:
    M MAINTAINERS
    M block/qcow.c
    M block/qcow2.c
    M hw/core/Makefile.objs
    A hw/core/vm-change-state-handler.c
    M hw/scsi/scsi-bus.c
    M hw/virtio/virtio.c
    M include/hw/qdev-core.h
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- virtio-scsi: Fix request resubmission after I/O error with iothreads
- qcow2: Fix missing v2/v3 subformat aliases for amend
- qcow(1): More specific error message for wrong format version
- MAINTAINERS: update RBD block maintainer

# gpg: Signature made Mon 08 Jul 2019 15:17:27 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qcow2: Allow -o compat=v3 during qemu-img amend
  MAINTAINERS: update RBD block maintainer
  block/qcow: Improve error when opening qcow2 files as qcow
  virtio-scsi: restart DMA after iothread
  qdev: add qdev_add_vm_change_state_handler()
  vl: add qemu_add_vm_change_state_handler_prio()

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/df34fe314b5d...a4efdb6b24dc