diff mbox

[03/10] s390-virtio: sort into categories

Message ID 1428569498-27393-4-git-send-email-cornelia.huck@de.ibm.com
State New
Headers show

Commit Message

Cornelia Huck April 9, 2015, 8:51 a.m. UTC 
Sort the various s390-virtio 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>
---
 hw/s390x/s390-virtio-bus.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Christian Borntraeger April 20, 2015, 2:47 p.m. UTC | #1 
Am 09.04.2015 um 10:51 schrieb Cornelia Huck:
> Sort the various s390-virtio 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/s390-virtio-bus.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
> index 047c963..c211da4 100644
> --- a/hw/s390x/s390-virtio-bus.c
> +++ b/hw/s390x/s390-virtio-bus.c
> @@ -519,6 +519,7 @@ static void s390_virtio_net_class_init(ObjectClass *klass, void *data)
> 
>      k->realize = s390_virtio_net_realize;
>      dc->props = s390_virtio_net_properties;
> +    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
>  }
> 
>  static const TypeInfo s390_virtio_net = {
> @@ -532,8 +533,10 @@ static const TypeInfo s390_virtio_net = {
>  static void s390_virtio_blk_class_init(ObjectClass *klass, void *data)
>  {
>      VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> 
>      k->realize = s390_virtio_blk_realize;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
> 
>  static const TypeInfo s390_virtio_blk = {
> @@ -555,6 +558,7 @@ static void s390_virtio_serial_class_init(ObjectClass *klass, void *data)
> 
>      k->realize = s390_virtio_serial_realize;
>      dc->props = s390_virtio_serial_properties;
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  }
> 
>  static const TypeInfo s390_virtio_serial = {
> @@ -577,6 +581,7 @@ static void s390_virtio_rng_class_init(ObjectClass *klass, void *data)
> 
>      k->realize = s390_virtio_rng_realize;
>      dc->props = s390_virtio_rng_properties;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }
> 
>  static const TypeInfo s390_virtio_rng = {
> @@ -635,6 +640,7 @@ static void s390_virtio_scsi_class_init(ObjectClass *klass, void *data)
> 
>      k->realize = s390_virtio_scsi_realize;
>      dc->props = s390_virtio_scsi_properties;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
> 
>  static const TypeInfo s390_virtio_scsi = {
> @@ -658,6 +664,7 @@ static void s390_vhost_scsi_class_init(ObjectClass *klass, void *data)
> 
>      k->realize = s390_vhost_scsi_realize;
>      dc->props = s390_vhost_scsi_properties;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
> 
>  static const TypeInfo s390_vhost_scsi = {
> @@ -681,8 +688,10 @@ static int s390_virtio_bridge_init(SysBusDevice *dev)
>  static void s390_virtio_bridge_class_init(ObjectClass *klass, void *data)
>  {
>      SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> 
>      k->init = s390_virtio_bridge_init;
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }
> 
>  static const TypeInfo s390_virtio_bridge_info = {
>
diff mbox

Patch

diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 047c963..c211da4 100644
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -519,6 +519,7 @@  static void s390_virtio_net_class_init(ObjectClass *klass, void *data)
 
     k->realize = s390_virtio_net_realize;
     dc->props = s390_virtio_net_properties;
+    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
 }
 
 static const TypeInfo s390_virtio_net = {
@@ -532,8 +533,10 @@  static const TypeInfo s390_virtio_net = {
 static void s390_virtio_blk_class_init(ObjectClass *klass, void *data)
 {
     VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     k->realize = s390_virtio_blk_realize;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static const TypeInfo s390_virtio_blk = {
@@ -555,6 +558,7 @@  static void s390_virtio_serial_class_init(ObjectClass *klass, void *data)
 
     k->realize = s390_virtio_serial_realize;
     dc->props = s390_virtio_serial_properties;
+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 }
 
 static const TypeInfo s390_virtio_serial = {
@@ -577,6 +581,7 @@  static void s390_virtio_rng_class_init(ObjectClass *klass, void *data)
 
     k->realize = s390_virtio_rng_realize;
     dc->props = s390_virtio_rng_properties;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo s390_virtio_rng = {
@@ -635,6 +640,7 @@  static void s390_virtio_scsi_class_init(ObjectClass *klass, void *data)
 
     k->realize = s390_virtio_scsi_realize;
     dc->props = s390_virtio_scsi_properties;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static const TypeInfo s390_virtio_scsi = {
@@ -658,6 +664,7 @@  static void s390_vhost_scsi_class_init(ObjectClass *klass, void *data)
 
     k->realize = s390_vhost_scsi_realize;
     dc->props = s390_vhost_scsi_properties;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static const TypeInfo s390_vhost_scsi = {
@@ -681,8 +688,10 @@  static int s390_virtio_bridge_init(SysBusDevice *dev)
 static void s390_virtio_bridge_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     k->init = s390_virtio_bridge_init;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo s390_virtio_bridge_info = {