[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/22] s390x/event-facility: exploit realize/unrealiz
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 14/22] s390x/event-facility: exploit realize/unrealize |
Date: |
Fri, 28 Feb 2014 10:30:58 +0100 |
From: Heinz Graalfs <address@hidden>
init/exit functionality of abstract SCLPEvent class is now exploiting
realize/unrealize.
Signed-off-by: Heinz Graalfs <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/event-facility.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 5b6d5c6..0777a93 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -377,22 +377,31 @@ static const TypeInfo sclp_event_facility_info = {
.class_size = sizeof(SCLPEventFacilityClass),
};
-static int event_qdev_init(DeviceState *qdev)
+static void event_realize(DeviceState *qdev, Error **errp)
{
- SCLPEvent *event = DO_UPCAST(SCLPEvent, qdev, qdev);
+ SCLPEvent *event = SCLP_EVENT(qdev);
SCLPEventClass *child = SCLP_EVENT_GET_CLASS(event);
- return child->init(event);
+ if (child->init) {
+ int rc = child->init(event);
+ if (rc < 0) {
+ error_setg(errp, "SCLP event initialization failed.");
+ return;
+ }
+ }
}
-static int event_qdev_exit(DeviceState *qdev)
+static void event_unrealize(DeviceState *qdev, Error **errp)
{
- SCLPEvent *event = DO_UPCAST(SCLPEvent, qdev, qdev);
+ SCLPEvent *event = SCLP_EVENT(qdev);
SCLPEventClass *child = SCLP_EVENT_GET_CLASS(event);
if (child->exit) {
- child->exit(event);
+ int rc = child->exit(event);
+ if (rc < 0) {
+ error_setg(errp, "SCLP event exit failed.");
+ return;
+ }
}
- return 0;
}
static void event_class_init(ObjectClass *klass, void *data)
@@ -401,8 +410,8 @@ static void event_class_init(ObjectClass *klass, void *data)
dc->bus_type = TYPE_SCLP_EVENTS_BUS;
dc->unplug = qdev_simple_unplug_cb;
- dc->init = event_qdev_init;
- dc->exit = event_qdev_exit;
+ dc->realize = event_realize;
+ dc->unrealize = event_unrealize;
}
static const TypeInfo sclp_event_type_info = {
--
1.8.4.2
- [Qemu-devel] [PULL 01/22] update linux headers to kvm/next, (continued)
- [Qemu-devel] [PULL 01/22] update linux headers to kvm/next, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 08/22] s390x/sclp: Fixed the size of sccb and code parameter, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 11/22] s390x/event-facility: some renaming, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 17/22] s390-ccw.img: new binary rom to match latest fixes, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 12/22] s390x/event-facility: code restructure, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 16/22] s390-ccw.img: Fix sporadic errors with ccw boot image - initialize css, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 20/22] s390x/kvm: Add missing SIGP CPU RESET order, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 02/22] s390x/kvm: implement floating-interrupt controller device, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 07/22] s390x/eventfacility: mask out commands, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 21/22] s390x/kvm: Rework priv instruction handlers, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 14/22] s390x/event-facility: exploit realize/unrealize,
Christian Borntraeger <=
- [Qemu-devel] [PULL 19/22] s390x/kvm: Rework SIGP INITIAL CPU RESET handler, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 04/22] s390x/kvm: Fixed bad SIGP SET-ARCHITECTURE handler, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 13/22] s390x/event-facility: add support for live migration, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 18/22] s390x/cpu: Use ioctl to reset state in the kernel, Christian Borntraeger, 2014/02/28
- [Qemu-devel] [PULL 22/22] s390x/ipl: Fix crash of ELF images with arbitrary entry points, Christian Borntraeger, 2014/02/28