Message ID | 1428569498-27393-3-git-send-email-cornelia.huck@de.ibm.com |
---|---|
State | New |
Headers | show |
Am 09.04.2015 um 10:51 schrieb Cornelia Huck: > Sort the various virtio-ccw devices into the same categories as their > virtio-pci counterparts. > > Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > hw/s390x/virtio-ccw.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index d32ecaf..9ef1059 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -1418,6 +1418,7 @@ static void virtio_ccw_net_class_init(ObjectClass *klass, void *data) > k->exit = virtio_ccw_exit; > dc->reset = virtio_ccw_reset; > dc->props = virtio_ccw_net_properties; > + set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); > } > > static const TypeInfo virtio_ccw_net = { > @@ -1444,6 +1445,7 @@ static void virtio_ccw_blk_class_init(ObjectClass *klass, void *data) > k->exit = virtio_ccw_exit; > dc->reset = virtio_ccw_reset; > dc->props = virtio_ccw_blk_properties; > + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); > } > > static const TypeInfo virtio_ccw_blk = { > @@ -1470,6 +1472,7 @@ static void virtio_ccw_serial_class_init(ObjectClass *klass, void *data) > k->exit = virtio_ccw_exit; > dc->reset = virtio_ccw_reset; > dc->props = virtio_ccw_serial_properties; > + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); > } > > static const TypeInfo virtio_ccw_serial = { > @@ -1496,6 +1499,7 @@ static void virtio_ccw_balloon_class_init(ObjectClass *klass, void *data) > k->exit = virtio_ccw_exit; > dc->reset = virtio_ccw_reset; > dc->props = virtio_ccw_balloon_properties; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > } > > static const TypeInfo virtio_ccw_balloon = { > @@ -1523,6 +1527,7 @@ static void virtio_ccw_scsi_class_init(ObjectClass *klass, void *data) > k->exit = virtio_ccw_exit; > dc->reset = virtio_ccw_reset; > dc->props = virtio_ccw_scsi_properties; > + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); > } > > static const TypeInfo virtio_ccw_scsi = { > @@ -1548,6 +1553,7 @@ static void vhost_ccw_scsi_class_init(ObjectClass *klass, void *data) > k->exit = virtio_ccw_exit; > dc->reset = virtio_ccw_reset; > dc->props = vhost_ccw_scsi_properties; > + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); > } > > static const TypeInfo vhost_ccw_scsi = { > @@ -1585,6 +1591,7 @@ static void virtio_ccw_rng_class_init(ObjectClass *klass, void *data) > k->exit = virtio_ccw_exit; > dc->reset = virtio_ccw_reset; > dc->props = virtio_ccw_rng_properties; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > } > > static const TypeInfo virtio_ccw_rng = { > @@ -1671,9 +1678,11 @@ static void virtual_css_bridge_class_init(ObjectClass *klass, void *data) > { > SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > k->init = virtual_css_bridge_init; > hc->unplug = virtio_ccw_busdev_unplug; > + set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); > } > > static const TypeInfo virtual_css_bridge_info = { >
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index d32ecaf..9ef1059 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1418,6 +1418,7 @@ static void virtio_ccw_net_class_init(ObjectClass *klass, void *data) k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_net_properties; + set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); } static const TypeInfo virtio_ccw_net = { @@ -1444,6 +1445,7 @@ static void virtio_ccw_blk_class_init(ObjectClass *klass, void *data) k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_blk_properties; + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } static const TypeInfo virtio_ccw_blk = { @@ -1470,6 +1472,7 @@ static void virtio_ccw_serial_class_init(ObjectClass *klass, void *data) k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_serial_properties; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } static const TypeInfo virtio_ccw_serial = { @@ -1496,6 +1499,7 @@ static void virtio_ccw_balloon_class_init(ObjectClass *klass, void *data) k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_balloon_properties; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } static const TypeInfo virtio_ccw_balloon = { @@ -1523,6 +1527,7 @@ static void virtio_ccw_scsi_class_init(ObjectClass *klass, void *data) k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_scsi_properties; + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } static const TypeInfo virtio_ccw_scsi = { @@ -1548,6 +1553,7 @@ static void vhost_ccw_scsi_class_init(ObjectClass *klass, void *data) k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = vhost_ccw_scsi_properties; + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } static const TypeInfo vhost_ccw_scsi = { @@ -1585,6 +1591,7 @@ static void virtio_ccw_rng_class_init(ObjectClass *klass, void *data) k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_rng_properties; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } static const TypeInfo virtio_ccw_rng = { @@ -1671,9 +1678,11 @@ static void virtual_css_bridge_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); k->init = virtual_css_bridge_init; hc->unplug = virtio_ccw_busdev_unplug; + set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); } static const TypeInfo virtual_css_bridge_info = {