Am 09.04.2015 um 10:51 schrieb Cornelia Huck: > Sort the sclp consoles into the input category, just as virtio-serial. > Various other sclp devices don't have an obvious category, sort them > into misc. > > Reviewed-by: David Hildenbrand <d...@linux.vnet.ibm.com> > Signed-off-by: Cornelia Huck <cornelia.h...@de.ibm.com>
Acked-by: Christian Borntraeger <borntrae...@de.ibm.com> > --- > hw/char/sclpconsole-lm.c | 1 + > hw/char/sclpconsole.c | 1 + > hw/s390x/event-facility.c | 1 + > hw/s390x/sclp.c | 9 +++++++++ > hw/s390x/sclpcpu.c | 2 ++ > hw/s390x/sclpquiesce.c | 1 + > 6 files changed, 15 insertions(+) > > diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c > index a9f5e62..02ac80b 100644 > --- a/hw/char/sclpconsole-lm.c > +++ b/hw/char/sclpconsole-lm.c > @@ -364,6 +364,7 @@ static void console_class_init(ObjectClass *klass, void > *data) > ec->can_handle_event = can_handle_event; > ec->read_event_data = read_event_data; > ec->write_event_data = write_event_data; > + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); > } > > static const TypeInfo sclp_console_info = { > diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c > index 79891df..b014c7f 100644 > --- a/hw/char/sclpconsole.c > +++ b/hw/char/sclpconsole.c > @@ -266,6 +266,7 @@ static void console_class_init(ObjectClass *klass, void > *data) > ec->can_handle_event = can_handle_event; > ec->read_event_data = read_event_data; > ec->write_event_data = write_event_data; > + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); > } > > static const TypeInfo sclp_console_info = { > diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c > index 78da718..1cb116a 100644 > --- a/hw/s390x/event-facility.c > +++ b/hw/s390x/event-facility.c > @@ -362,6 +362,7 @@ static void init_event_facility_class(ObjectClass *klass, > void *data) > > dc->reset = reset_event_facility; > dc->vmsd = &vmstate_event_facility; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > k->init = init_event_facility; > k->command_handler = command_handler; > k->event_pending = event_pending; > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index a969975..b3a6c5e 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -457,10 +457,19 @@ sclpMemoryHotplugDev *get_sclp_memory_hotplug_dev(void) > TYPE_SCLP_MEMORY_HOTPLUG_DEV, NULL)); > } > > +static void sclp_memory_hotplug_dev_class_init(ObjectClass *klass, > + void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > +} > + > static TypeInfo sclp_memory_hotplug_dev_info = { > .name = TYPE_SCLP_MEMORY_HOTPLUG_DEV, > .parent = TYPE_SYS_BUS_DEVICE, > .instance_size = sizeof(sclpMemoryHotplugDev), > + .class_init = sclp_memory_hotplug_dev_class_init, > }; > > static void register_types(void) > diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c > index 3600fe2..2fe8b5a 100644 > --- a/hw/s390x/sclpcpu.c > +++ b/hw/s390x/sclpcpu.c > @@ -88,12 +88,14 @@ static int irq_cpu_hotplug_init(SCLPEvent *event) > static void cpu_class_init(ObjectClass *oc, void *data) > { > SCLPEventClass *k = SCLP_EVENT_CLASS(oc); > + DeviceClass *dc = DEVICE_CLASS(oc); > > k->init = irq_cpu_hotplug_init; > k->get_send_mask = send_mask; > k->get_receive_mask = receive_mask; > k->read_event_data = read_event_data; > k->write_event_data = NULL; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > } > > static const TypeInfo sclp_cpu_info = { > diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c > index 1a399bd..ffa5553 100644 > --- a/hw/s390x/sclpquiesce.c > +++ b/hw/s390x/sclpquiesce.c > @@ -116,6 +116,7 @@ static void quiesce_class_init(ObjectClass *klass, void > *data) > > dc->reset = quiesce_reset; > dc->vmsd = &vmstate_sclpquiesce; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > k->init = quiesce_init; > > k->get_send_mask = send_mask; >