1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] s390x: sort some devices into categories

Cornelia Huck posted 1 patch 6 years, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171004090032.27365-1-cohuck@redhat.com
Test checkpatch passed
Test docker passed
Test s390x passed
hw/s390x/3270-ccw.c     | 1 +
hw/s390x/s390-pci-bus.c | 1 +
hw/vfio/ccw.c           | 1 +
3 files changed, 3 insertions(+)
[Qemu-devel] [PATCH] s390x: sort some devices into categories
Posted by Cornelia Huck 6 years, 6 months ago 
Add missing categorizations for some s390x devices:
- zpci device -> misc
- 3270 -> display
- vfio-ccw -> misc

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 hw/s390x/3270-ccw.c     | 1 +
 hw/s390x/s390-pci-bus.c | 1 +
 hw/vfio/ccw.c           | 1 +
 3 files changed, 3 insertions(+)

diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
index eaca28e224..081e3ef6f4 100644
--- a/hw/s390x/3270-ccw.c
+++ b/hw/s390x/3270-ccw.c
@@ -160,6 +160,7 @@ static void emulated_ccw_3270_class_init(ObjectClass *klass, void *data)
     dc->bus_type = TYPE_VIRTUAL_CSS_BUS;
     dc->realize = emulated_ccw_3270_realize;
     dc->hotpluggable = false;
+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
 }
 
 static const TypeInfo emulated_ccw_3270_info = {
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 3b9965fde0..96116b7d1e 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -1032,6 +1032,7 @@ static void s390_pci_device_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
 
     dc->desc = "zpci device";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
     dc->reset = s390_pci_device_reset;
     dc->bus_type = TYPE_S390_PCI_BUS;
     dc->realize = s390_pci_device_realize;
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index a8baadf57a..76323c6bde 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -413,6 +413,7 @@ static void vfio_ccw_class_init(ObjectClass *klass, void *data)
     dc->props = vfio_ccw_properties;
     dc->vmsd = &vfio_ccw_vmstate;
     dc->desc = "VFIO-based subchannel assignment";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
     dc->realize = vfio_ccw_realize;
     dc->unrealize = vfio_ccw_unrealize;
     dc->reset = vfio_ccw_reset;
-- 
2.13.6
Re: [Qemu-devel] [PATCH] s390x: sort some devices into categories
Posted by Christian Borntraeger 6 years, 6 months ago 
On 10/04/2017 11:00 AM, Cornelia Huck wrote:
> Add missing categorizations for some s390x devices:
> - zpci device -> misc
> - 3270 -> display
> - vfio-ccw -> misc
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

> ---
>  hw/s390x/3270-ccw.c     | 1 +
>  hw/s390x/s390-pci-bus.c | 1 +
>  hw/vfio/ccw.c           | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
> index eaca28e224..081e3ef6f4 100644
> --- a/hw/s390x/3270-ccw.c
> +++ b/hw/s390x/3270-ccw.c
> @@ -160,6 +160,7 @@ static void emulated_ccw_3270_class_init(ObjectClass *klass, void *data)
>      dc->bus_type = TYPE_VIRTUAL_CSS_BUS;
>      dc->realize = emulated_ccw_3270_realize;
>      dc->hotpluggable = false;
> +    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
>  }
> 
>  static const TypeInfo emulated_ccw_3270_info = {
> diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
> index 3b9965fde0..96116b7d1e 100644
> --- a/hw/s390x/s390-pci-bus.c
> +++ b/hw/s390x/s390-pci-bus.c
> @@ -1032,6 +1032,7 @@ static void s390_pci_device_class_init(ObjectClass *klass, void *data)
>      DeviceClass *dc = DEVICE_CLASS(klass);
> 
>      dc->desc = "zpci device";
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>      dc->reset = s390_pci_device_reset;
>      dc->bus_type = TYPE_S390_PCI_BUS;
>      dc->realize = s390_pci_device_realize;
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index a8baadf57a..76323c6bde 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -413,6 +413,7 @@ static void vfio_ccw_class_init(ObjectClass *klass, void *data)
>      dc->props = vfio_ccw_properties;
>      dc->vmsd = &vfio_ccw_vmstate;
>      dc->desc = "VFIO-based subchannel assignment";
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>      dc->realize = vfio_ccw_realize;
>      dc->unrealize = vfio_ccw_unrealize;
>      dc->reset = vfio_ccw_reset;
>
Re: [Qemu-devel] [PATCH] s390x: sort some devices into categories
Posted by Thomas Huth 6 years, 6 months ago 
On 04.10.2017 11:00, Cornelia Huck wrote:
> Add missing categorizations for some s390x devices:
> - zpci device -> misc
> - 3270 -> display
> - vfio-ccw -> misc
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
>  hw/s390x/3270-ccw.c     | 1 +
>  hw/s390x/s390-pci-bus.c | 1 +
>  hw/vfio/ccw.c           | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
> index eaca28e224..081e3ef6f4 100644
> --- a/hw/s390x/3270-ccw.c
> +++ b/hw/s390x/3270-ccw.c
> @@ -160,6 +160,7 @@ static void emulated_ccw_3270_class_init(ObjectClass *klass, void *data)
>      dc->bus_type = TYPE_VIRTUAL_CSS_BUS;
>      dc->realize = emulated_ccw_3270_realize;
>      dc->hotpluggable = false;
> +    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

While you're at it, add a proper dc->desc ?

>  }
>  
>  static const TypeInfo emulated_ccw_3270_info = {
> diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
> index 3b9965fde0..96116b7d1e 100644
> --- a/hw/s390x/s390-pci-bus.c
> +++ b/hw/s390x/s390-pci-bus.c
> @@ -1032,6 +1032,7 @@ static void s390_pci_device_class_init(ObjectClass *klass, void *data)
>      DeviceClass *dc = DEVICE_CLASS(klass);
>  
>      dc->desc = "zpci device";

While you're at it, add better desc?

> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>      dc->reset = s390_pci_device_reset;
>      dc->bus_type = TYPE_S390_PCI_BUS;
>      dc->realize = s390_pci_device_realize;
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index a8baadf57a..76323c6bde 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -413,6 +413,7 @@ static void vfio_ccw_class_init(ObjectClass *klass, void *data)
>      dc->props = vfio_ccw_properties;
>      dc->vmsd = &vfio_ccw_vmstate;
>      dc->desc = "VFIO-based subchannel assignment";
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>      dc->realize = vfio_ccw_realize;
>      dc->unrealize = vfio_ccw_unrealize;
>      dc->reset = vfio_ccw_reset;
> 

Anyway, it's also fine without better descs, so:

Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [Qemu-devel] [PATCH] s390x: sort some devices into categories
Posted by Cornelia Huck 6 years, 6 months ago 
On Wed, 4 Oct 2017 11:20:00 +0200
Thomas Huth <thuth@redhat.com> wrote:

> On 04.10.2017 11:00, Cornelia Huck wrote:
> > Add missing categorizations for some s390x devices:
> > - zpci device -> misc
> > - 3270 -> display
> > - vfio-ccw -> misc
> > 
> > Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> > ---
> >  hw/s390x/3270-ccw.c     | 1 +
> >  hw/s390x/s390-pci-bus.c | 1 +
> >  hw/vfio/ccw.c           | 1 +
> >  3 files changed, 3 insertions(+)
> > 
> > diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
> > index eaca28e224..081e3ef6f4 100644
> > --- a/hw/s390x/3270-ccw.c
> > +++ b/hw/s390x/3270-ccw.c
> > @@ -160,6 +160,7 @@ static void emulated_ccw_3270_class_init(ObjectClass *klass, void *data)
> >      dc->bus_type = TYPE_VIRTUAL_CSS_BUS;
> >      dc->realize = emulated_ccw_3270_realize;
> >      dc->hotpluggable = false;
> > +    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);  
> 
> While you're at it, add a proper dc->desc ?
> 
> >  }
> >  
> >  static const TypeInfo emulated_ccw_3270_info = {
> > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
> > index 3b9965fde0..96116b7d1e 100644
> > --- a/hw/s390x/s390-pci-bus.c
> > +++ b/hw/s390x/s390-pci-bus.c
> > @@ -1032,6 +1032,7 @@ static void s390_pci_device_class_init(ObjectClass *klass, void *data)
> >      DeviceClass *dc = DEVICE_CLASS(klass);
> >  
> >      dc->desc = "zpci device";  
> 
> While you're at it, add better desc?

Hey, it's not wrong :) (and I can't really think of a good one...)

> 
> > +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> >      dc->reset = s390_pci_device_reset;
> >      dc->bus_type = TYPE_S390_PCI_BUS;
> >      dc->realize = s390_pci_device_realize;
> > diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> > index a8baadf57a..76323c6bde 100644
> > --- a/hw/vfio/ccw.c
> > +++ b/hw/vfio/ccw.c
> > @@ -413,6 +413,7 @@ static void vfio_ccw_class_init(ObjectClass *klass, void *data)
> >      dc->props = vfio_ccw_properties;
> >      dc->vmsd = &vfio_ccw_vmstate;
> >      dc->desc = "VFIO-based subchannel assignment";
> > +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> >      dc->realize = vfio_ccw_realize;
> >      dc->unrealize = vfio_ccw_unrealize;
> >      dc->reset = vfio_ccw_reset;
> >   
> 
> Anyway, it's also fine without better descs, so:
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [Qemu-devel] [PATCH] s390x: sort some devices into categories
Posted by Cornelia Huck 6 years, 6 months ago 
On Wed,  4 Oct 2017 11:00:32 +0200
Cornelia Huck <cohuck@redhat.com> wrote:

> Add missing categorizations for some s390x devices:
> - zpci device -> misc
> - 3270 -> display
> - vfio-ccw -> misc
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
>  hw/s390x/3270-ccw.c     | 1 +
>  hw/s390x/s390-pci-bus.c | 1 +
>  hw/vfio/ccw.c           | 1 +
>  3 files changed, 3 insertions(+)

Queued to s390-next.

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.