Commit 2231384e authored by Nia Alarie's avatar Nia Alarie Committed by Cornelia Huck
Browse files

s390x/sclpconsole: Remove dead code - remove exit handlers 



The other event handlers (quiesce and cpu) do not define these
handlers, and this one does nothing, so it can be removed.

Signed-off-by: default avatarNia Alarie <nia.alarie@gmail.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20180306100721.19419-1-nia.alarie@gmail.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 81ce6aa5

hw/char/sclpconsole-lm.c

+0 −6
Original line number Diff line number Diff line
@@ -318,11 +318,6 @@ static int console_init(SCLPEvent *event) 
    return 0;

}



static int console_exit(SCLPEvent *event)

{

    return 0;

}



static void console_reset(DeviceState *dev)

{

   SCLPEvent *event = SCLP_EVENT(dev);
@@ -349,7 +344,6 @@ static void console_class_init(ObjectClass *klass, void *data) 
    dc->reset = console_reset;

    dc->vmsd = &vmstate_sclplmconsole;

    ec->init = console_init;

    ec->exit = console_exit;

    ec->get_send_mask = send_mask;

    ec->get_receive_mask = receive_mask;

    ec->can_handle_event = can_handle_event;

hw/char/sclpconsole.c

+0 −6
Original line number Diff line number Diff line
@@ -246,11 +246,6 @@ static void console_reset(DeviceState *dev) 
   scon->notify = false;

}



static int console_exit(SCLPEvent *event)

{

    return 0;

}



static Property console_properties[] = {

    DEFINE_PROP_CHR("chardev", SCLPConsole, chr),

    DEFINE_PROP_END_OF_LIST(),
@@ -265,7 +260,6 @@ static void console_class_init(ObjectClass *klass, void *data) 
    dc->reset = console_reset;

    dc->vmsd = &vmstate_sclpconsole;

    ec->init = console_init;

    ec->exit = console_exit;

    ec->get_send_mask = send_mask;

    ec->get_receive_mask = receive_mask;

    ec->can_handle_event = can_handle_event;

hw/s390x/event-facility.c

+0 −14
Original line number Diff line number Diff line
@@ -431,26 +431,12 @@ static void event_realize(DeviceState *qdev, Error **errp) 
    }

}



static void event_unrealize(DeviceState *qdev, Error **errp)

{

    SCLPEvent *event = SCLP_EVENT(qdev);

    SCLPEventClass *child = SCLP_EVENT_GET_CLASS(event);

    if (child->exit) {

        int rc = child->exit(event);

        if (rc < 0) {

            error_setg(errp, "SCLP event exit failed.");

            return;

        }

    }

}



static void event_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->bus_type = TYPE_SCLP_EVENTS_BUS;

    dc->realize = event_realize;

    dc->unrealize = event_unrealize;

}



static const TypeInfo sclp_event_type_info = {

include/hw/s390x/event-facility.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ typedef struct SCLPEvent { 
typedef struct SCLPEventClass {

    DeviceClass parent_class;

    int (*init)(SCLPEvent *event);

    int (*exit)(SCLPEvent *event);



    /* get SCLP's send mask */

    unsigned int (*get_send_mask)(void);