From: Philippe Mathieu-Daudé <f4...@amsat.org> following the DeviceRealize and DeviceUnrealize typedefs, this unify a bit the new QOM API.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> Message-Id: <20180114020412.26160-2-f4...@amsat.org> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> (cherry picked from commit b850f664a1dbbc1ea27bef12cd251ee5da0bfe05) *prereq for 0c53057adb Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com> --- include/hw/qdev-core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 0a71bf83f0..83db53b3f5 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -32,9 +32,9 @@ typedef enum DeviceCategory { typedef int (*qdev_initfn)(DeviceState *dev); typedef int (*qdev_event)(DeviceState *dev); -typedef void (*qdev_resetfn)(DeviceState *dev); typedef void (*DeviceRealize)(DeviceState *dev, Error **errp); typedef void (*DeviceUnrealize)(DeviceState *dev, Error **errp); +typedef void (*DeviceReset)(DeviceState *dev); typedef void (*BusRealize)(BusState *bus, Error **errp); typedef void (*BusUnrealize)(BusState *bus, Error **errp); @@ -117,7 +117,7 @@ typedef struct DeviceClass { bool hotpluggable; /* callbacks */ - void (*reset)(DeviceState *dev); + DeviceReset reset; DeviceRealize realize; DeviceUnrealize unrealize; -- 2.11.0