diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-05-11 15:31:47 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-09-07 16:10:43 +0200 |
| commit | 35925a7a73e7df4118cb11667095bd2d8fc4e091 (patch) | |
| tree | 76b805f6b42b4366c8b83c31e92f75d7008054ec | |
| parent | f6102c329c43d7d5e0bee1fc2fe4043e05f9810c (diff) | |
| download | qemu-35925a7a73e7df4118cb11667095bd2d8fc4e091.zip | |
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>
| -rw-r--r-- | hw/s390x/event-facility.c | 2 | ||||
| -rw-r--r-- | hw/s390x/sclpcpu.c | 2 | ||||
| -rw-r--r-- | hw/s390x/sclpquiesce.c | 4 | ||||
| -rw-r--r-- | include/hw/s390x/event-facility.h | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 7b64e782e9..ef2a05160a 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -353,7 +353,7 @@ static void init_event_facility(Object *obj) TYPE_SCLP_EVENTS_BUS, sdev, NULL); object_initialize(&event_facility->quiesce_event, sizeof(SCLPEvent), - "sclpquiesce"); + TYPE_SCLP_QUIESCE); qdev_set_parent_bus(DEVICE(&event_facility->quiesce_event), &event_facility->sbus.qbus); object_initialize(&event_facility->cpu_hotplug_event, sizeof(SCLPEvent), diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c index 615ac06b18..322eb31d95 100644 --- a/hw/s390x/sclpcpu.c +++ b/hw/s390x/sclpcpu.c @@ -85,7 +85,7 @@ static void cpu_class_init(ObjectClass *oc, void *data) } static const TypeInfo sclp_cpu_info = { - .name = "sclp-cpu-hotplug", + .name = TYPE_SCLP_CPU_HOTPLUG, .parent = TYPE_SCLP_EVENT, .instance_size = sizeof(SCLPEvent), .class_init = cpu_class_init, diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index ffa5553135..15b06e108b 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -66,7 +66,7 @@ static int read_event_data(SCLPEvent *event, EventBufferHeader *evt_buf_hdr, } static const VMStateDescription vmstate_sclpquiesce = { - .name = "sclpquiesce", + .name = TYPE_SCLP_QUIESCE, .version_id = 0, .minimum_version_id = 0, .fields = (VMStateField[]) { @@ -127,7 +127,7 @@ static void quiesce_class_init(ObjectClass *klass, void *data) } static const TypeInfo sclp_quiesce_info = { - .name = "sclpquiesce", + .name = TYPE_SCLP_QUIESCE, .parent = TYPE_SCLP_EVENT, .instance_size = sizeof(SCLPEvent), .class_init = quiesce_class_init, diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h index eae3b3bd63..3c1ee350c8 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -47,6 +47,7 @@ OBJECT_GET_CLASS(SCLPEventClass, (obj), TYPE_SCLP_EVENT) #define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug" +#define TYPE_SCLP_QUIESCE "sclpquiesce" typedef struct WriteEventMask { SCCBHeader h; |