Commit c3d9f24a authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

s390/eventfacility: allow childs to handle more than 1 event type 



Currently all handlers (quiesce, console) only handle one event type.
Some drivers will handle multiple (compatible) event types. Rework the
code accordingly.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarAlexander Graf <agraf@suse.de>
parent 8b8b1138

hw/char/sclpconsole.c

+3 −3
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) 


/* functions to be called by event facility */



static int event_type(void)

static bool can_handle_event(uint8_t type)

{

    return SCLP_EVENT_ASCII_CONSOLE_DATA;

    return type == SCLP_EVENT_ASCII_CONSOLE_DATA;

}



static unsigned int send_mask(void)
@@ -272,7 +272,7 @@ static void console_class_init(ObjectClass *klass, void *data) 
    ec->exit = console_exit;

    ec->get_send_mask = send_mask;

    ec->get_receive_mask = receive_mask;

    ec->event_type = event_type;

    ec->can_handle_event = can_handle_event;

    ec->read_event_data = read_event_data;

    ec->write_event_data = write_event_data;

}

hw/s390x/event-facility.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static uint16_t handle_write_event_buf(SCLPEventFacility *ef, 
        ec = SCLP_EVENT_GET_CLASS(event);



        if (ec->write_event_data &&

            ec->event_type() == event_buf->type) {

            ec->can_handle_event(event_buf->type)) {

            rc = ec->write_event_data(event, event_buf);

            break;

        }

hw/s390x/sclpquiesce.c

+3 −3
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ typedef struct SignalQuiesce { 
    uint8_t unit;

} QEMU_PACKED SignalQuiesce;



static int event_type(void)

static bool can_handle_event(uint8_t type)

{

    return SCLP_EVENT_SIGNAL_QUIESCE;

    return type == SCLP_EVENT_SIGNAL_QUIESCE;

}



static unsigned int send_mask(void)
@@ -121,7 +121,7 @@ static void quiesce_class_init(ObjectClass *klass, void *data) 


    k->get_send_mask = send_mask;

    k->get_receive_mask = receive_mask;

    k->event_type = event_type;

    k->can_handle_event = can_handle_event;

    k->read_event_data = read_event_data;

    k->write_event_data = NULL;

}

include/hw/s390x/event-facility.h

+2 −3
Original line number Diff line number Diff line
@@ -87,9 +87,8 @@ typedef struct SCLPEventClass { 


    int (*write_event_data)(SCLPEvent *event, EventBufferHeader *evt_buf_hdr);



    /* returns the supported event type */

    int (*event_type)(void);



    /* can we handle this event type? */

    bool (*can_handle_event)(uint8_t type);

} SCLPEventClass;



#endif