[PATCH v2 00/12] Categorize some uncategorized devices

[PATCH v2 00/12] Categorize some uncategorized devices

[Gan Qixin]

v1->v2:

-Patch2: Add Pankaj Gupta reviewed tag.
-Patch3: Add Philippe Mathieu-Daudé reviewed tag.
-Patch9:
    Changes suggested by Gerd Hoffmann:
    Put u2f-passthru into 'misc' category.
-Patch12: 
    Add Alistair Francis and Philippe Mathieu-Daudé reviewed tag.
-Patch13:
    bcm2835_cprman is not an usable device, so delete the patch that categorize
it.

Gan Qixin (12):
  pc-dimm: put it into the 'storage' category
  virtio-pmem: put it into the 'storage' category
  vmmouse: put it into the 'input' category
  nvdimm: put it into the 'storage' category
  mc146818rtc: put it into the 'misc' category
  ipmi: put some ipmi devices into the correct category
  tpm: put some tpm devices into the correct category
  AMDVI-PCI: put it into the 'misc' category
  u2f-passthru: put it into the 'misc' category
  tosa-ssp: put it into the 'misc' category
  spitz: put some Spitz-family devices into the correct category
  SPI flash devices: put them into the 'storage' category

 hw/arm/spitz.c            | 2 ++
 hw/arm/tosa.c             | 2 ++
 hw/block/m25p80.c         | 1 +
 hw/i386/amd_iommu.c       | 8 ++++++++
 hw/i386/vmmouse.c         | 1 +
 hw/ipmi/ipmi_bmc_extern.c | 1 +
 hw/ipmi/ipmi_bmc_sim.c    | 1 +
 hw/ipmi/isa_ipmi_bt.c     | 1 +
 hw/ipmi/isa_ipmi_kcs.c    | 1 +
 hw/ipmi/pci_ipmi_bt.c     | 1 +
 hw/ipmi/pci_ipmi_kcs.c    | 1 +
 hw/mem/nvdimm.c           | 1 +
 hw/mem/pc-dimm.c          | 1 +
 hw/rtc/mc146818rtc.c      | 1 +
 hw/tpm/tpm_tis_isa.c      | 1 +
 hw/tpm/tpm_tis_sysbus.c   | 1 +
 hw/usb/u2f-passthru.c     | 1 +
 hw/virtio/virtio-pmem.c   | 1 +
 18 files changed, 27 insertions(+)

-- 
2.23.0

[PATCH v2 01/12] pc-dimm: put it into the 'storage' category

[Gan Qixin]

The category of the pc-dimm device is not set, put it into the 'storage'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Michael S. Tsirkin <mst@redhat.com>
---
 hw/mem/pc-dimm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 2ffc986734..017146e3d1 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -282,6 +282,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data)
     mdc->get_plugged_size = memory_device_get_region_size;
     mdc->get_memory_region = pc_dimm_md_get_memory_region;
     mdc->fill_device_info = pc_dimm_md_fill_device_info;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static TypeInfo pc_dimm_info = {
-- 
2.23.0

Re: [PATCH v2 01/12] pc-dimm: put it into the 'storage' category

[Pankaj Gupta]

> The category of the pc-dimm device is not set, put it into the 'storage'
> category.
>
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/mem/pc-dimm.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 2ffc986734..017146e3d1 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -282,6 +282,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data)
>      mdc->get_plugged_size = memory_device_get_region_size;
>      mdc->get_memory_region = pc_dimm_md_get_memory_region;
>      mdc->fill_device_info = pc_dimm_md_fill_device_info;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

Any reason why pc-dimm would be in the storage category?

>  }
>
>  static TypeInfo pc_dimm_info = {
> --
> 2.23.0
>
>

RE: [PATCH v2 01/12] pc-dimm: put it into the 'storage' category

[ganqixin]

> -----Original Message-----
> From: Pankaj Gupta [mailto:pankaj.gupta.linux@gmail.com]
> Sent: Monday, November 30, 2020 6:19 PM
> To: ganqixin <ganqixin@huawei.com>
> Cc: Qemu Developers <qemu-devel@nongnu.org>; qemu-trivial@nongnu.org;
> Chenqun (kuhn) <kuhn.chenqun@huawei.com>; thuth@redhat.com;
> Zhanghailiang <zhang.zhanghailiang@huawei.com>; Michael S . Tsirkin
> <mst@redhat.com>
> Subject: Re: [PATCH v2 01/12] pc-dimm: put it into the 'storage' category
> 
> > The category of the pc-dimm device is not set, put it into the 'storage'
> > category.
> >
> > Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> > ---
> > Cc: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >  hw/mem/pc-dimm.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index
> > 2ffc986734..017146e3d1 100644
> > --- a/hw/mem/pc-dimm.c
> > +++ b/hw/mem/pc-dimm.c
> > @@ -282,6 +282,7 @@ static void pc_dimm_class_init(ObjectClass *oc,
> void *data)
> >      mdc->get_plugged_size = memory_device_get_region_size;
> >      mdc->get_memory_region = pc_dimm_md_get_memory_region;
> >      mdc->fill_device_info = pc_dimm_md_fill_device_info;
> > +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> 
> Any reason why pc-dimm would be in the storage category?

Hi Pankaj,
Thanks for you reply. As far as I know, pc-dimm is a dimm device for memory hotplug, described as a "DIMM memory module" in "-device help". 
This device looks related to storage, so I put it into the "storage" category to make it easy to find. I'm not sure if this is appropriate, do you have any better ideas?

Gan Qixin

> 
> >  }
> >
> >  static TypeInfo pc_dimm_info = {
> > --
> > 2.23.0
> >
> >

Re: [PATCH v2 01/12] pc-dimm: put it into the 'storage' category

[Pankaj Gupta]

 >      mdc->get_memory_region = pc_dimm_md_get_memory_region;
> > >      mdc->fill_device_info = pc_dimm_md_fill_device_info;
> > > +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> >
> > Any reason why pc-dimm would be in the storage category?
...
> Thanks for you reply. As far as I know, pc-dimm is a dimm device for memory hotplug, described as a "DIMM memory module" in "-device help".
> This device looks related to storage, so I put it into the "storage" category to make it easy to find. I'm not sure if this is appropriate, do you have any better ideas?

O.k. I see storage & memory as different devices. Since we don't have
any memory device type defined, maybe its okay to put it in MISC
device.

Thanks,
Pankaj

RE: [PATCH v2 01/12] pc-dimm: put it into the 'storage' category

[ganqixin]

> -----Original Message-----
> From: Pankaj Gupta [mailto:pankaj.gupta.linux@gmail.com]
> Sent: Friday, December 4, 2020 3:13 PM
> To: ganqixin <ganqixin@huawei.com>
> Cc: Qemu Developers <qemu-devel@nongnu.org>;
> qemu-trivial@nongnu.org; Chenqun (kuhn)
> <kuhn.chenqun@huawei.com>; thuth@redhat.com; Zhanghailiang
> <zhang.zhanghailiang@huawei.com>; Michael S . Tsirkin <mst@redhat.com>
> Subject: Re: [PATCH v2 01/12] pc-dimm: put it into the 'storage' category
> 
>  >      mdc->get_memory_region =
> pc_dimm_md_get_memory_region;
> > > >      mdc->fill_device_info = pc_dimm_md_fill_device_info;
> > > > +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> > >
> > > Any reason why pc-dimm would be in the storage category?
> ...
> > Thanks for you reply. As far as I know, pc-dimm is a dimm device for
> memory hotplug, described as a "DIMM memory module" in "-device
> help".
> > This device looks related to storage, so I put it into the "storage"
> category to make it easy to find. I'm not sure if this is appropriate, do you
> have any better ideas?
> 
> O.k. I see storage & memory as different devices. Since we don't have any
> memory device type defined, maybe its okay to put it in MISC device.

You're right. Maybe I should send a separate patch to add the "memory" category and move the memory device from "uncategorized" and "misc" to "memory".

Thanks,
Gan Qixin

> 
> Thanks,
> Pankaj

[PATCH v2 02/12] virtio-pmem: put it into the 'storage' category

[Gan Qixin]

The category of the virtio-pmem device is not set, put it into the 'storage'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@cloud.ionos.com>
---
Cc: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/virtio-pmem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index ddb0125901..98b3139cd0 100644
--- a/hw/virtio/virtio-pmem.c
+++ b/hw/virtio/virtio-pmem.c
@@ -175,6 +175,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data)
 
     vpc->fill_device_info = virtio_pmem_fill_device_info;
     vpc->get_memory_region = virtio_pmem_get_memory_region;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static TypeInfo virtio_pmem_info = {
-- 
2.23.0

Re: [PATCH v2 02/12] virtio-pmem: put it into the 'storage' category

[Laurent Vivier]

Le 30/11/2020 à 09:36, Gan Qixin a écrit :
> The category of the virtio-pmem device is not set, put it into the 'storage'
> category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> Reviewed-by: Pankaj Gupta <pankaj.gupta@cloud.ionos.com>
> ---
> Cc: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/virtio/virtio-pmem.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
> index ddb0125901..98b3139cd0 100644
> --- a/hw/virtio/virtio-pmem.c
> +++ b/hw/virtio/virtio-pmem.c
> @@ -175,6 +175,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data)
>  
>      vpc->fill_device_info = virtio_pmem_fill_device_info;
>      vpc->get_memory_region = virtio_pmem_get_memory_region;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
>  
>  static TypeInfo virtio_pmem_info = {
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH v2 03/12] vmmouse: put it into the 'input' category

[Gan Qixin]

The category of the vmmouse device is not set, put it into the 'input'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/vmmouse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index a3556438f0..df4798f502 100644
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -308,6 +308,7 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data)
     dc->reset = vmmouse_reset;
     dc->vmsd = &vmstate_vmmouse;
     device_class_set_props(dc, vmmouse_properties);
+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 }
 
 static const TypeInfo vmmouse_info = {
-- 
2.23.0

Re: [PATCH v2 03/12] vmmouse: put it into the 'input' category

[Thomas Huth]

On 30/11/2020 09.36, Gan Qixin wrote:
> The category of the vmmouse device is not set, put it into the 'input'
> category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/i386/vmmouse.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
> index a3556438f0..df4798f502 100644
> --- a/hw/i386/vmmouse.c
> +++ b/hw/i386/vmmouse.c
> @@ -308,6 +308,7 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data)
>      dc->reset = vmmouse_reset;
>      dc->vmsd = &vmstate_vmmouse;
>      device_class_set_props(dc, vmmouse_properties);
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  }
>  
>  static const TypeInfo vmmouse_info = {
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 03/12] vmmouse: put it into the 'input' category

[Laurent Vivier]

Le 30/11/2020 à 09:36, Gan Qixin a écrit :
> The category of the vmmouse device is not set, put it into the 'input'
> category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/i386/vmmouse.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
> index a3556438f0..df4798f502 100644
> --- a/hw/i386/vmmouse.c
> +++ b/hw/i386/vmmouse.c
> @@ -308,6 +308,7 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data)
>      dc->reset = vmmouse_reset;
>      dc->vmsd = &vmstate_vmmouse;
>      device_class_set_props(dc, vmmouse_properties);
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  }
>  
>  static const TypeInfo vmmouse_info = {
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH v2 04/12] nvdimm: put it into the 'storage' category

[Gan Qixin]

The category of the nvdimm device is not set, put it into the 'storage'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Xiao Guangrong <xiaoguangrong.eric@gmail.com>
---
 hw/mem/nvdimm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index e1574bc07c..e30695b2ce 100644
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -236,6 +236,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)
 
     nvc->read_label_data = nvdimm_read_label_data;
     nvc->write_label_data = nvdimm_write_label_data;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static TypeInfo nvdimm_info = {
-- 
2.23.0

Re: [PATCH v2 04/12] nvdimm: put it into the 'storage' category

[Pankaj Gupta]

> The category of the nvdimm device is not set, put it into the 'storage'
> category.
>
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Xiao Guangrong <xiaoguangrong.eric@gmail.com>
> ---
>  hw/mem/nvdimm.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
> index e1574bc07c..e30695b2ce 100644
> --- a/hw/mem/nvdimm.c
> +++ b/hw/mem/nvdimm.c
> @@ -236,6 +236,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)
>
>      nvc->read_label_data = nvdimm_read_label_data;
>      nvc->write_label_data = nvdimm_write_label_data;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
>
>  static TypeInfo nvdimm_info = {

Reviewed-by: Pankaj Gupta <pankaj.gupta@cloud.ionos.com>

Re: [PATCH v2 04/12] nvdimm: put it into the 'storage' category

[Thomas Huth]

On 30/11/2020 09.36, Gan Qixin wrote:
> The category of the nvdimm device is not set, put it into the 'storage'
> category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Xiao Guangrong <xiaoguangrong.eric@gmail.com>
> ---
>  hw/mem/nvdimm.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
> index e1574bc07c..e30695b2ce 100644
> --- a/hw/mem/nvdimm.c
> +++ b/hw/mem/nvdimm.c
> @@ -236,6 +236,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)
>  
>      nvc->read_label_data = nvdimm_read_label_data;
>      nvc->write_label_data = nvdimm_write_label_data;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
>  
>  static TypeInfo nvdimm_info = {
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 04/12] nvdimm: put it into the 'storage' category

[Laurent Vivier]

Le 30/11/2020 à 09:36, Gan Qixin a écrit :
> The category of the nvdimm device is not set, put it into the 'storage'
> category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Xiao Guangrong <xiaoguangrong.eric@gmail.com>
> ---
>  hw/mem/nvdimm.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
> index e1574bc07c..e30695b2ce 100644
> --- a/hw/mem/nvdimm.c
> +++ b/hw/mem/nvdimm.c
> @@ -236,6 +236,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)
>  
>      nvc->read_label_data = nvdimm_read_label_data;
>      nvc->write_label_data = nvdimm_write_label_data;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
>  
>  static TypeInfo nvdimm_info = {
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH v2 05/12] mc146818rtc: put it into the 'misc' category

[Gan Qixin]

The category of the mc146818rtc device is not set, put it into the 'misc'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Michael S. Tsirkin <mst@redhat.com>
---
 hw/rtc/mc146818rtc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index 7a38540cb9..39edca0996 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -1039,6 +1039,7 @@ static void rtc_class_initfn(ObjectClass *klass, void *data)
     dc->vmsd = &vmstate_rtc;
     isa->build_aml = rtc_build_aml;
     device_class_set_props(dc, mc146818rtc_properties);
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo mc146818rtc_info = {
-- 
2.23.0

Re: [PATCH v2 05/12] mc146818rtc: put it into the 'misc' category

[Thomas Huth]

On 30/11/2020 09.36, Gan Qixin wrote:
> The category of the mc146818rtc device is not set, put it into the 'misc'
> category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/rtc/mc146818rtc.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
> index 7a38540cb9..39edca0996 100644
> --- a/hw/rtc/mc146818rtc.c
> +++ b/hw/rtc/mc146818rtc.c
> @@ -1039,6 +1039,7 @@ static void rtc_class_initfn(ObjectClass *klass, void *data)
>      dc->vmsd = &vmstate_rtc;
>      isa->build_aml = rtc_build_aml;
>      device_class_set_props(dc, mc146818rtc_properties);
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }

I wonder whether this device should be user_creatable at all (e.g. it uses a
hard-coded IO port)... Anyway setting the category certainly does not hurt,
thus:

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 05/12] mc146818rtc: put it into the 'misc' category

[Philippe Mathieu-Daudé]

On 12/21/20 12:53 PM, Thomas Huth wrote:
> On 30/11/2020 09.36, Gan Qixin wrote:
>> The category of the mc146818rtc device is not set, put it into the 'misc'
>> category.
>>
>> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
>> ---
>> Cc: Michael S. Tsirkin <mst@redhat.com>
>> ---
>>  hw/rtc/mc146818rtc.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
>> index 7a38540cb9..39edca0996 100644
>> --- a/hw/rtc/mc146818rtc.c
>> +++ b/hw/rtc/mc146818rtc.c
>> @@ -1039,6 +1039,7 @@ static void rtc_class_initfn(ObjectClass *klass, void *data)
>>      dc->vmsd = &vmstate_rtc;
>>      isa->build_aml = rtc_build_aml;
>>      device_class_set_props(dc, mc146818rtc_properties);
>> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>>  }
> 
> I wonder whether this device should be user_creatable at all (e.g. it uses a
> hard-coded IO port)... Anyway setting the category certainly does not hurt,
> thus:
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Can this go via qemu-trivial?

Re: [PATCH v2 05/12] mc146818rtc: put it into the 'misc' category

[Laurent Vivier]

Le 24/03/2021 à 18:23, Philippe Mathieu-Daudé a écrit :
> On 12/21/20 12:53 PM, Thomas Huth wrote:
>> On 30/11/2020 09.36, Gan Qixin wrote:
>>> The category of the mc146818rtc device is not set, put it into the 'misc'
>>> category.
>>>
>>> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
>>> ---
>>> Cc: Michael S. Tsirkin <mst@redhat.com>
>>> ---
>>>  hw/rtc/mc146818rtc.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
>>> index 7a38540cb9..39edca0996 100644
>>> --- a/hw/rtc/mc146818rtc.c
>>> +++ b/hw/rtc/mc146818rtc.c
>>> @@ -1039,6 +1039,7 @@ static void rtc_class_initfn(ObjectClass *klass, void *data)
>>>      dc->vmsd = &vmstate_rtc;
>>>      isa->build_aml = rtc_build_aml;
>>>      device_class_set_props(dc, mc146818rtc_properties);
>>> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>>>  }
>>
>> I wonder whether this device should be user_creatable at all (e.g. it uses a
>> hard-coded IO port)... Anyway setting the category certainly does not hurt,
>> thus:
>>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 
> Can this go via qemu-trivial?
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH v2 06/12] ipmi: put some ipmi devices into the correct category

[Gan Qixin]

Some ipmi devices have no category, put them into the correct category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Corey Minyard <minyard@acm.org>
---
 hw/ipmi/ipmi_bmc_extern.c | 1 +
 hw/ipmi/ipmi_bmc_sim.c    | 1 +
 hw/ipmi/isa_ipmi_bt.c     | 1 +
 hw/ipmi/isa_ipmi_kcs.c    | 1 +
 hw/ipmi/pci_ipmi_bt.c     | 1 +
 hw/ipmi/pci_ipmi_kcs.c    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index c3f3306e66..aa8faf9a9b 100644
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -529,6 +529,7 @@ static void ipmi_bmc_extern_class_init(ObjectClass *oc, void *data)
     dc->hotpluggable = false;
     dc->realize = ipmi_bmc_extern_realize;
     device_class_set_props(dc, ipmi_bmc_extern_properties);
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo ipmi_bmc_extern_type = {
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index f78e92d3d5..611650f79e 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -2214,6 +2214,7 @@ static void ipmi_sim_class_init(ObjectClass *oc, void *data)
     dc->realize = ipmi_sim_realize;
     device_class_set_props(dc, ipmi_sim_properties);
     bk->handle_command = ipmi_sim_handle_command;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo ipmi_sim_type = {
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index b7c2ad557b..7fc6022f13 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -152,6 +152,7 @@ static void isa_ipmi_bt_class_init(ObjectClass *oc, void *data)
     iic->get_backend_data = isa_ipmi_bt_get_backend_data;
     ipmi_bt_class_init(iic);
     iic->get_fwinfo = isa_ipmi_bt_get_fwinfo;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo isa_ipmi_bt_info = {
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index 7dd6bf0040..b50901fc3b 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -159,6 +159,7 @@ static void isa_ipmi_kcs_class_init(ObjectClass *oc, void *data)
     iic->get_backend_data = isa_ipmi_kcs_get_backend_data;
     ipmi_kcs_class_init(iic);
     iic->get_fwinfo = isa_ipmi_kcs_get_fwinfo;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo isa_ipmi_kcs_info = {
diff --git a/hw/ipmi/pci_ipmi_bt.c b/hw/ipmi/pci_ipmi_bt.c
index b6e52730d3..7d7435719a 100644
--- a/hw/ipmi/pci_ipmi_bt.c
+++ b/hw/ipmi/pci_ipmi_bt.c
@@ -125,6 +125,7 @@ static void pci_ipmi_bt_class_init(ObjectClass *oc, void *data)
 
     iic->get_backend_data = pci_ipmi_bt_get_backend_data;
     ipmi_bt_class_init(iic);
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo pci_ipmi_bt_info = {
diff --git a/hw/ipmi/pci_ipmi_kcs.c b/hw/ipmi/pci_ipmi_kcs.c
index de13418862..0f1a1e4098 100644
--- a/hw/ipmi/pci_ipmi_kcs.c
+++ b/hw/ipmi/pci_ipmi_kcs.c
@@ -125,6 +125,7 @@ static void pci_ipmi_kcs_class_init(ObjectClass *oc, void *data)
 
     iic->get_backend_data = pci_ipmi_kcs_get_backend_data;
     ipmi_kcs_class_init(iic);
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo pci_ipmi_kcs_info = {
-- 
2.23.0

[PATCH v2 07/12] tpm: put some tpm devices into the correct category

[Gan Qixin]

Some tpm devices have no category, put them into the correct category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 hw/tpm/tpm_tis_isa.c    | 1 +
 hw/tpm/tpm_tis_sysbus.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
index 6fd876eebf..10d8a14f19 100644
--- a/hw/tpm/tpm_tis_isa.c
+++ b/hw/tpm/tpm_tis_isa.c
@@ -150,6 +150,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
     dc->reset = tpm_tis_isa_reset;
     tc->request_completed = tpm_tis_isa_request_completed;
     tc->get_version = tpm_tis_isa_get_tpm_version;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo tpm_tis_isa_info = {
diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
index 2c32aa7099..45e63efd63 100644
--- a/hw/tpm/tpm_tis_sysbus.c
+++ b/hw/tpm/tpm_tis_sysbus.c
@@ -139,6 +139,7 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
     dc->reset = tpm_tis_sysbus_reset;
     tc->request_completed = tpm_tis_sysbus_request_completed;
     tc->get_version = tpm_tis_sysbus_get_tpm_version;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo tpm_tis_sysbus_info = {
-- 
2.23.0

Re: [PATCH v2 07/12] tpm: put some tpm devices into the correct category

[Stefan Berger]

On 11/30/20 3:36 AM, Gan Qixin wrote:
> Some tpm devices have no category, put them into the correct category.
>
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
>   hw/tpm/tpm_tis_isa.c    | 1 +
>   hw/tpm/tpm_tis_sysbus.c | 1 +
>   2 files changed, 2 insertions(+)
>
> diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
> index 6fd876eebf..10d8a14f19 100644
> --- a/hw/tpm/tpm_tis_isa.c
> +++ b/hw/tpm/tpm_tis_isa.c
> @@ -150,6 +150,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
>       dc->reset = tpm_tis_isa_reset;
>       tc->request_completed = tpm_tis_isa_request_completed;
>       tc->get_version = tpm_tis_isa_get_tpm_version;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>   }
>
>   static const TypeInfo tpm_tis_isa_info = {
> diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
> index 2c32aa7099..45e63efd63 100644
> --- a/hw/tpm/tpm_tis_sysbus.c
> +++ b/hw/tpm/tpm_tis_sysbus.c
> @@ -139,6 +139,7 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
>       dc->reset = tpm_tis_sysbus_reset;
>       tc->request_completed = tpm_tis_sysbus_request_completed;
>       tc->get_version = tpm_tis_sysbus_get_tpm_version;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>   }
>
>   static const TypeInfo tpm_tis_sysbus_info = {

Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>

Re: [PATCH v2 07/12] tpm: put some tpm devices into the correct category

[Laurent Vivier]

Le 30/11/2020 à 09:36, Gan Qixin a écrit :
> Some tpm devices have no category, put them into the correct category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
>  hw/tpm/tpm_tis_isa.c    | 1 +
>  hw/tpm/tpm_tis_sysbus.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
> index 6fd876eebf..10d8a14f19 100644
> --- a/hw/tpm/tpm_tis_isa.c
> +++ b/hw/tpm/tpm_tis_isa.c
> @@ -150,6 +150,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass, void *data)
>      dc->reset = tpm_tis_isa_reset;
>      tc->request_completed = tpm_tis_isa_request_completed;
>      tc->get_version = tpm_tis_isa_get_tpm_version;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }
>  
>  static const TypeInfo tpm_tis_isa_info = {
> diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
> index 2c32aa7099..45e63efd63 100644
> --- a/hw/tpm/tpm_tis_sysbus.c
> +++ b/hw/tpm/tpm_tis_sysbus.c
> @@ -139,6 +139,7 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)
>      dc->reset = tpm_tis_sysbus_reset;
>      tc->request_completed = tpm_tis_sysbus_request_completed;
>      tc->get_version = tpm_tis_sysbus_get_tpm_version;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }
>  
>  static const TypeInfo tpm_tis_sysbus_info = {
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH v2 08/12] AMDVI-PCI: put it into the 'misc' category

[Gan Qixin]

The category of the AMDVI-PCI device is not set, put it into the 'misc'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/amd_iommu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index 74a93a5d93..1d4e488f7f 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1621,6 +1621,13 @@ static const TypeInfo amdvi = {
     .class_init = amdvi_class_init
 };
 
+static void amdvi_pci_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+}
+
 static const TypeInfo amdviPCI = {
     .name = TYPE_AMD_IOMMU_PCI,
     .parent = TYPE_PCI_DEVICE,
@@ -1629,6 +1636,7 @@ static const TypeInfo amdviPCI = {
         { INTERFACE_CONVENTIONAL_PCI_DEVICE },
         { },
     },
+    .class_init = amdvi_pci_class_init
 };
 
 static void amdvi_iommu_memory_region_class_init(ObjectClass *klass, void *data)
-- 
2.23.0

[PATCH v2 09/12] u2f-passthru: put it into the 'misc' category

[Gan Qixin]

The category of the u2f-passthru device is not set, put it into the 'misc'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/usb/u2f-passthru.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c
index ae00e93f35..fc93429c9c 100644
--- a/hw/usb/u2f-passthru.c
+++ b/hw/usb/u2f-passthru.c
@@ -534,6 +534,7 @@ static void u2f_passthru_class_init(ObjectClass *klass, void *data)
     dc->desc = "QEMU U2F passthrough key";
     dc->vmsd = &u2f_passthru_vmstate;
     device_class_set_props(dc, u2f_passthru_properties);
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo u2f_key_passthru_info = {
-- 
2.23.0

Re: [PATCH v2 09/12] u2f-passthru: put it into the 'misc' category

[Gerd Hoffmann]

On Mon, Nov 30, 2020 at 04:36:27PM +0800, Gan Qixin wrote:
> The category of the u2f-passthru device is not set, put it into the 'misc'
> category.

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

Re: [PATCH v2 09/12] u2f-passthru: put it into the 'misc' category

[Laurent Vivier]

Le 30/11/2020 à 09:36, Gan Qixin a écrit :
> The category of the u2f-passthru device is not set, put it into the 'misc'
> category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/usb/u2f-passthru.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c
> index ae00e93f35..fc93429c9c 100644
> --- a/hw/usb/u2f-passthru.c
> +++ b/hw/usb/u2f-passthru.c
> @@ -534,6 +534,7 @@ static void u2f_passthru_class_init(ObjectClass *klass, void *data)
>      dc->desc = "QEMU U2F passthrough key";
>      dc->vmsd = &u2f_passthru_vmstate;
>      device_class_set_props(dc, u2f_passthru_properties);
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }
>  
>  static const TypeInfo u2f_key_passthru_info = {
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

[PATCH v2 10/12] tosa-ssp: put it into the 'misc' category

[Gan Qixin]

The category of the tosa-ssp device is not set, put it into the 'misc'
category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/tosa.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index fe88ed89fe..0e3461c8ed 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -292,10 +292,12 @@ static const TypeInfo tosa_dac_info = {
 
 static void tosa_ssp_class_init(ObjectClass *klass, void *data)
 {
+    DeviceClass *dc = DEVICE_CLASS(klass);
     SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
 
     k->realize = tosa_ssp_realize;
     k->transfer = tosa_ssp_tansfer;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo tosa_ssp_info = {
-- 
2.23.0

[PATCH v2 11/12] spitz: put some Spitz-family devices into the correct category

[Gan Qixin]

Some Spitz-family devices have no category, put them into the correct category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/spitz.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 32bdeacfd3..0e5e8a4634 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -1218,6 +1218,7 @@ static void corgi_ssp_class_init(ObjectClass *klass, void *data)
     k->realize = corgi_ssp_realize;
     k->transfer = corgi_ssp_transfer;
     dc->vmsd = &vmstate_corgi_ssp_regs;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo corgi_ssp_info = {
@@ -1247,6 +1248,7 @@ static void spitz_lcdtg_class_init(ObjectClass *klass, void *data)
     k->realize = spitz_lcdtg_realize;
     k->transfer = spitz_lcdtg_transfer;
     dc->vmsd = &vmstate_spitz_lcdtg_regs;
+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
 }
 
 static const TypeInfo spitz_lcdtg_info = {
-- 
2.23.0

Re: [PATCH v2 11/12] spitz: put some Spitz-family devices into the correct category

[Philippe Mathieu-Daudé]

Hi,

On 11/30/20 9:36 AM, Gan Qixin wrote:
> Some Spitz-family devices have no category, put them into the correct category.
> 
> Signed-off-by: Gan Qixin <ganqixin@huawei.com>
> ---
> Cc: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/arm/spitz.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
> index 32bdeacfd3..0e5e8a4634 100644
> --- a/hw/arm/spitz.c
> +++ b/hw/arm/spitz.c
> @@ -1218,6 +1218,7 @@ static void corgi_ssp_class_init(ObjectClass *klass, void *data)
>      k->realize = corgi_ssp_realize;
>      k->transfer = corgi_ssp_transfer;
>      dc->vmsd = &vmstate_corgi_ssp_regs;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

OK.

>  }
>  
>  static const TypeInfo corgi_ssp_info = {
> @@ -1247,6 +1248,7 @@ static void spitz_lcdtg_class_init(ObjectClass *klass, void *data)
>      k->realize = spitz_lcdtg_realize;
>      k->transfer = spitz_lcdtg_transfer;
>      dc->vmsd = &vmstate_spitz_lcdtg_regs;
> +    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

This is not a display device, but a regulator to
control the display backlight. DEVICE_CATEGORY_MISC
seems more appropriate.

>  }
>  
>  static const TypeInfo spitz_lcdtg_info = {
> 

Regards,

Phil.

[PATCH v2 12/12] SPI flash devices: put them into the 'storage' category

[Gan Qixin]

SPI flash devices have no category, put them into the 'storage' category.

Signed-off-by: Gan Qixin <ganqixin@huawei.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/block/m25p80.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 483925f57a..8dd3ef8559 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -1397,6 +1397,7 @@ static void m25p80_class_init(ObjectClass *klass, void *data)
     device_class_set_props(dc, m25p80_properties);
     dc->reset = m25p80_reset;
     mc->pi = data;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static const TypeInfo m25p80_info = {
-- 
2.23.0