On Tue, Aug 06, 2019 at 05:14:33PM +0200, Markus Armbruster wrote:
> diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
> index e5b62dd2fc..de70b7a19a 100644
> --- a/include/hw/qdev-core.h
> +++ b/include/hw/qdev-core.h
> @@ -5,7 +5,6 @@
> #include "qemu/bitmap.h"
> #include "qom/object.h"
> #include "hw/hotplug.h"
> -#include "sysemu/sysemu.h"
>
> enum {
> DEV_NVECTORS_UNSPECIFIED = -1,
> @@ -451,8 +450,4 @@ 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 227202999d..908f158677 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -29,6 +29,9 @@ 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);
> +VMChangeStateEntry *qdev_add_vm_change_state_handler(DeviceState *dev,
> + VMChangeStateHandler
> *cb,
> + void *opaque);
> void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
> void vm_state_notify(int running, RunState state);
>
Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
