Commit 35925a7a authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

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: default avatarMatthew Rosato <mjrosato@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent f6102c32

hw/s390x/event-facility.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

hw/s390x/sclpcpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

hw/s390x/sclpquiesce.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

include/hw/s390x/event-facility.h

+1 −0
Original line number Diff line number Diff line
@@ -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;