OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390/sclp: replace sclp event types with proper defines 

Introduce TYPE_SCLP_QUIESCE and make use of it. Also use
TYPE_SCLP_CPU_HOTPLUG where applicable.

Reviewed-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
David Hildenbrand 2015-05-11 15:31:47 +02:00 committed by Cornelia Huck
parent f6102c329c
commit 35925a7a73
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/event-facility.c
View File

@ -353,7 +353,7 @@ static void init_event_facility(Object *obj)
TYPE_SCLP_EVENTS_BUS, sdev, NULL); TYPE_SCLP_EVENTS_BUS, sdev, NULL);
object_initialize(&event_facility->quiesce_event, sizeof(SCLPEvent), object_initialize(&event_facility->quiesce_event, sizeof(SCLPEvent),
"sclpquiesce"); TYPE_SCLP_QUIESCE);
qdev_set_parent_bus(DEVICE(&event_facility->quiesce_event), qdev_set_parent_bus(DEVICE(&event_facility->quiesce_event),
&event_facility->sbus.qbus); &event_facility->sbus.qbus);
object_initialize(&event_facility->cpu_hotplug_event, sizeof(SCLPEvent), object_initialize(&event_facility->cpu_hotplug_event, sizeof(SCLPEvent),

2
hw/s390x/sclpcpu.c
View File

@ -85,7 +85,7 @@ static void cpu_class_init(ObjectClass *oc, void *data)
} }
static const TypeInfo sclp_cpu_info = { static const TypeInfo sclp_cpu_info = {
.name = "sclp-cpu-hotplug", .name = TYPE_SCLP_CPU_HOTPLUG,
.parent = TYPE_SCLP_EVENT, .parent = TYPE_SCLP_EVENT,
.instance_size = sizeof(SCLPEvent), .instance_size = sizeof(SCLPEvent),
.class_init = cpu_class_init, .class_init = cpu_class_init,

4
hw/s390x/sclpquiesce.c
View File

@ -66,7 +66,7 @@ static int read_event_data(SCLPEvent *event, EventBufferHeader *evt_buf_hdr,
} }
static const VMStateDescription vmstate_sclpquiesce = { static const VMStateDescription vmstate_sclpquiesce = {
.name = "sclpquiesce", .name = TYPE_SCLP_QUIESCE,
.version_id = 0, .version_id = 0,
.minimum_version_id = 0, .minimum_version_id = 0,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
@ -127,7 +127,7 @@ static void quiesce_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo sclp_quiesce_info = { static const TypeInfo sclp_quiesce_info = {
.name = "sclpquiesce", .name = TYPE_SCLP_QUIESCE,
.parent = TYPE_SCLP_EVENT, .parent = TYPE_SCLP_EVENT,
.instance_size = sizeof(SCLPEvent), .instance_size = sizeof(SCLPEvent),
.class_init = quiesce_class_init, .class_init = quiesce_class_init,

1
include/hw/s390x/event-facility.h
View File

@ -47,6 +47,7 @@
OBJECT_GET_CLASS(SCLPEventClass, (obj), TYPE_SCLP_EVENT) OBJECT_GET_CLASS(SCLPEventClass, (obj), TYPE_SCLP_EVENT)
#define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug" #define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug"
#define TYPE_SCLP_QUIESCE "sclpquiesce"
typedef struct WriteEventMask { typedef struct WriteEventMask {
SCCBHeader h; SCCBHeader h;