[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/17] s390/eventfacility: allow childs to handle mor
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 15/17] s390/eventfacility: allow childs to handle more than 1 event type |
Date: |
Tue, 24 Sep 2013 09:27:49 +0200 |
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 <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
---
hw/char/sclpconsole.c | 6 +++---
hw/s390x/event-facility.c | 2 +-
hw/s390x/sclpquiesce.c | 6 +++---
include/hw/s390x/event-facility.h | 5 ++---
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index 8cb0e41..16d77c5 100644
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -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;
}
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index d2fd227..25951a0 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -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;
}
diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index 6162678..a3c4bd6 100644
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -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;
}
diff --git a/include/hw/s390x/event-facility.h
b/include/hw/s390x/event-facility.h
index ff0f625..c0f5d19 100644
--- a/include/hw/s390x/event-facility.h
+++ b/include/hw/s390x/event-facility.h
@@ -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
--
1.8.3.1
- [Qemu-devel] [PULL 09/17] s390/sclpconsole: Add code to support live migration for sclpconsole, (continued)
- [Qemu-devel] [PULL 09/17] s390/sclpconsole: Add code to support live migration for sclpconsole, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 17/17] s390/sclplmconsole: Add support for SCLP line-mode console, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 10/17] s390/sclpquiesce: Add code to support live migration, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 11/17] s390/sclp: add reset() functions, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 12/17] s390/eventfacility: fix multiple Read Event Data sources, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 13/17] s390/eventfacility: Fix receive/send masks, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 16/17] s390/ebcdic: Move conversion tables to header file, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 14/17] s390/eventfacility: remove unused event_type variable, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 05/17] s390/cpu: Make setcc() function available to other files, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 03/17] s390/ipl: Fix waiting for virtio processing, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 15/17] s390/eventfacility: allow childs to handle more than 1 event type,
Christian Borntraeger <=
- [Qemu-devel] [PULL 08/17] s390/sclpconsole: modify definition of input buffer, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 02/17] s390/dump: zero out padding bytes in notes sections, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 01/17] s390/kvm: Add check for priviledged SCLP handler, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 07/17] s390/kexec: Implement diag308 subcode 0, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 04/17] s390/ipl: Update the s390-ccw.img rom, Christian Borntraeger, 2013/09/24
- [Qemu-devel] [PULL 06/17] s390/ioinst: Moved the CC setting to the IO instruction handlers, Christian Borntraeger, 2013/09/24
- Re: [Qemu-devel] [PULL 00/17] s390 patches, Alexander Graf, 2013/09/25