diff options
| author | Peter Maydell | 2019-07-08 16:21:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-08 16:21:20 +0200 |
| commit | a4efdb6b24dceccd97f0a615a1752eb6fb92d46b (patch) | |
| tree | 62ff443f3810dfde90b675fe9bdb17da737ecabc /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190708'... (diff) | |
| parent | qcow2: Allow -o compat=v3 during qemu-img amend (diff) | |
| download | qemu-a4efdb6b24dceccd97f0a615a1752eb6fb92d46b.tar.gz qemu-a4efdb6b24dceccd97f0a615a1752eb6fb92d46b.tar.xz qemu-a4efdb6b24dceccd97f0a615a1752eb6fb92d46b.zip | |
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 <kwolf@redhat.com>" [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 <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/qdev-core.h | 5 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index fa55dc10ae..e157fc4acd 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -6,6 +6,7 @@ #include "qom/object.h" #include "hw/irq.h" #include "hw/hotplug.h" +#include "sysemu/sysemu.h" enum { DEV_NVECTORS_UNSPECIFIED = -1, @@ -450,4 +451,8 @@ static inline bool qbus_is_hotpluggable(BusState *bus) void device_listener_register(DeviceListener *listener); void device_listener_unregister(DeviceListener *listener); +VMChangeStateEntry *qdev_add_vm_change_state_handler(DeviceState *dev, + VMChangeStateHandler *cb, + void *opaque); + #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 61579ae71e..984c439ac9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -29,6 +29,8 @@ typedef void VMChangeStateHandler(void *opaque, int running, RunState state); VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb, void *opaque); +VMChangeStateEntry *qemu_add_vm_change_state_handler_prio( + VMChangeStateHandler *cb, void *opaque, int priority); void qemu_del_vm_change_state_handler(VMChangeStateEntry *e); void vm_state_notify(int running, RunState state); |