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

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: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Christian Borntraeger 2013-09-17 13:07:30 +02:00
parent 8b8b1138df
commit c3d9f24a39
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/char/sclpconsole.c
View File

@ -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;
}

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

@ -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;
}

6
hw/s390x/sclpquiesce.c
View File

@ -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;
}

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

@ -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