[PATCH-for-10.0 00/12] hw: Categorize few devices and add their descriptions

[PATCH-for-10.0 00/12] hw: Categorize few devices and add their descriptions

[Philippe Mathieu-Daudé]

Few devices are user-creatable but miss a description,
and sometimes are not categorized (or mis-categorized).

Some, being qdev and not sysbus, are automatically
user-creatable, but are part of SoC.

Fix that.

Philippe Mathieu-Daudé (12):
  hw/audio/wm8750: Categorize and add description
  hw/block/m25p80: Categorize and add description
  hw/display/dm163: Add description
  hw/dma/i82374: Categorize and add description
  hw/gpio/pca9552: Categorize and add description
  hw/i2c/pca954x: Categorize and add description
  hw/misc/axp2xx: Categorize and add description
  hw/misc/pll: Do not expose as user-creatable
  hw/nvram/xlnx-efuse: Do not expose as user-creatable
  hw/rtc: Categorize and add description
  hw/sensor/temp: Categorize and add description
  hw/s390x/zpci: Re-categorize as BRIDGE

 hw/audio/wm8750.c        | 2 ++
 hw/block/m25p80.c        | 2 ++
 hw/display/dm163.c       | 2 +-
 hw/dma/i82374.c          | 2 ++
 hw/gpio/pca9552.c        | 2 ++
 hw/i2c/i2c_mux_pca954x.c | 8 +++++++-
 hw/misc/axp2xx.c         | 5 +++++
 hw/misc/bcm2835_cprman.c | 8 ++++++++
 hw/misc/npcm_clk.c       | 6 ++++++
 hw/misc/stm32l4x5_rcc.c  | 4 ++++
 hw/nvram/xlnx-efuse.c    | 2 ++
 hw/rtc/ds1338.c          | 2 ++
 hw/rtc/m41t80.c          | 2 ++
 hw/rtc/rs5c372.c         | 2 ++
 hw/s390x/s390-pci-bus.c  | 2 +-
 hw/sensor/dps310.c       | 2 ++
 hw/sensor/emc141x.c      | 6 ++++++
 hw/sensor/tmp105.c       | 2 ++
 hw/sensor/tmp421.c       | 4 ++++
 19 files changed, 62 insertions(+), 3 deletions(-)

-- 
2.47.1

[PATCH-for-10.0 01/12] hw/audio/wm8750: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/audio/wm8750.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
index 8d381dbc658..6c1bb20fb75 100644
--- a/hw/audio/wm8750.c
+++ b/hw/audio/wm8750.c
@@ -721,6 +721,8 @@ static void wm8750_class_init(ObjectClass *klass, void *data)
     sc->send = wm8750_tx;
     dc->vmsd = &vmstate_wm8750;
     device_class_set_props(dc, wm8750_properties);
+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
+    dc->desc = "WM8750 Stereo CODEC";
 }
 
 static const TypeInfo wm8750_info = {
-- 
2.47.1

[PATCH-for-10.0 02/12] hw/block/m25p80: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/block/m25p80.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index b84c6afb327..0887c103e4f 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -1870,7 +1870,9 @@ static void m25p80_class_init(ObjectClass *klass, void *data)
     dc->vmsd = &vmstate_m25p80;
     device_class_set_props(dc, m25p80_properties);
     device_class_set_legacy_reset(dc, m25p80_reset);
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
     mc->pi = data;
+    dc->desc = "Serial Flash";
 }
 
 static const TypeInfo m25p80_info = {
-- 
2.47.1

[PATCH-for-10.0 03/12] hw/display/dm163: Add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/display/dm163.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/display/dm163.c b/hw/display/dm163.c
index 75a91f62bd3..f6f0ec0c632 100644
--- a/hw/display/dm163.c
+++ b/hw/display/dm163.c
@@ -330,7 +330,7 @@ static void dm163_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     ResettableClass *rc = RESETTABLE_CLASS(klass);
 
-    dc->desc = "DM163";
+    dc->desc = "DM163 8x3-channel constant current LED driver";
     dc->vmsd = &vmstate_dm163;
     dc->realize = dm163_realize;
     rc->phases.hold = dm163_reset_hold;
-- 
2.47.1

[PATCH-for-10.0 04/12] hw/dma/i82374: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/dma/i82374.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index 9652d47adcd..0bf69ef399b 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -150,6 +150,8 @@ static void i82374_class_init(ObjectClass *klass, void *data)
     dc->realize = i82374_realize;
     dc->vmsd = &vmstate_i82374;
     device_class_set_props(dc, i82374_properties);
+    dc->desc = "Intel 82374 DMA controller";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo i82374_info = {
-- 
2.47.1

[PATCH-for-10.0 05/12] hw/gpio/pca9552: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/gpio/pca9552.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c
index 1ac0cf6c464..b152872f6c6 100644
--- a/hw/gpio/pca9552.c
+++ b/hw/gpio/pca9552.c
@@ -459,6 +459,8 @@ static void pca9552_class_init(ObjectClass *oc, void *data)
     DeviceClass *dc = DEVICE_CLASS(oc);
     PCA955xClass *pc = PCA955X_CLASS(oc);
 
+    dc->desc = "PCA9552 LED blinker";
+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
     device_class_set_legacy_reset(dc, pca9552_reset);
     dc->vmsd = &pca9552_vmstate;
     pc->max_reg = PCA9552_LS3;
-- 
2.47.1

[PATCH-for-10.0 06/12] hw/i2c/pca954x: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/i2c/i2c_mux_pca954x.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c
index 779cc4e66ed..100b8d86093 100644
--- a/hw/i2c/i2c_mux_pca954x.c
+++ b/hw/i2c/i2c_mux_pca954x.c
@@ -175,12 +175,18 @@ I2CBus *pca954x_i2c_get_bus(I2CSlave *mux, uint8_t channel)
 static void pca9546_class_init(ObjectClass *klass, void *data)
 {
     Pca954xClass *s = PCA954X_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->desc = "PCA9546 I2C multiplexer";
     s->nchans = PCA9546_CHANNEL_COUNT;
 }
 
 static void pca9548_class_init(ObjectClass *klass, void *data)
 {
     Pca954xClass *s = PCA954X_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->desc = "PCA9548 I2C multiplexer";
     s->nchans = PCA9548_CHANNEL_COUNT;
 }
 
@@ -226,13 +232,13 @@ static void pca954x_class_init(ObjectClass *klass, void *data)
 
     rc->phases.enter = pca954x_enter_reset;
 
-    dc->desc = "Pca954x i2c-mux";
     dc->realize = pca954x_realize;
 
     k->write_data = pca954x_write_data;
     k->receive_byte = pca954x_read_byte;
 
     device_class_set_props(dc, pca954x_props);
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo pca954x_info[] = {
-- 
2.47.1

[PATCH-for-10.0 07/12] hw/misc/axp2xx: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/axp2xx.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/misc/axp2xx.c b/hw/misc/axp2xx.c
index af646878cd2..747af430479 100644
--- a/hw/misc/axp2xx.c
+++ b/hw/misc/axp2xx.c
@@ -232,6 +232,7 @@ static void axp2xx_class_init(ObjectClass *oc, void *data)
     ResettableClass *rc = RESETTABLE_CLASS(oc);
 
     rc->phases.enter = axp2xx_reset_enter;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
     dc->vmsd = &vmstate_axp2xx;
     isc->event = axp2xx_event;
     isc->recv = axp2xx_rx;
@@ -250,7 +251,9 @@ static const TypeInfo axp2xx_info = {
 static void axp209_class_init(ObjectClass *oc, void *data)
 {
     AXP2xxClass *sc = AXP2XX_CLASS(oc);
+    DeviceClass *dc = DEVICE_CLASS(oc);
 
+    dc->desc = "AXP209 power system management";
     sc->reset_enter = axp209_reset_enter;
 }
 
@@ -263,7 +266,9 @@ static const TypeInfo axp209_info = {
 static void axp221_class_init(ObjectClass *oc, void *data)
 {
     AXP2xxClass *sc = AXP2XX_CLASS(oc);
+    DeviceClass *dc = DEVICE_CLASS(oc);
 
+    dc->desc = "AXP221 power system management";
     sc->reset_enter = axp221_reset_enter;
 }
 
-- 
2.47.1

[PATCH-for-10.0 08/12] hw/misc/pll: Do not expose as user-creatable

[Philippe Mathieu-Daudé]

All these devices are part of SoC components and can not
be created manually.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/bcm2835_cprman.c | 8 ++++++++
 hw/misc/npcm_clk.c       | 6 ++++++
 hw/misc/stm32l4x5_rcc.c  | 4 ++++
 3 files changed, 18 insertions(+)

diff --git a/hw/misc/bcm2835_cprman.c b/hw/misc/bcm2835_cprman.c
index aa14cd931f5..0c4d4b7de50 100644
--- a/hw/misc/bcm2835_cprman.c
+++ b/hw/misc/bcm2835_cprman.c
@@ -137,6 +137,8 @@ static void pll_class_init(ObjectClass *klass, void *data)
 
     device_class_set_legacy_reset(dc, pll_reset);
     dc->vmsd = &pll_vmstate;
+    /* Reason: Part of BCM2835CprmanState component */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo cprman_pll_info = {
@@ -241,6 +243,8 @@ static void pll_channel_class_init(ObjectClass *klass, void *data)
 
     device_class_set_legacy_reset(dc, pll_channel_reset);
     dc->vmsd = &pll_channel_vmstate;
+    /* Reason: Part of BCM2835CprmanState component */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo cprman_pll_channel_info = {
@@ -362,6 +366,8 @@ static void clock_mux_class_init(ObjectClass *klass, void *data)
 
     device_class_set_legacy_reset(dc, clock_mux_reset);
     dc->vmsd = &clock_mux_vmstate;
+    /* Reason: Part of BCM2835CprmanState component */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo cprman_clock_mux_info = {
@@ -416,6 +422,8 @@ static void dsi0hsck_mux_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
 
     dc->vmsd = &dsi0hsck_mux_vmstate;
+    /* Reason: Part of BCM2835CprmanState component */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo cprman_dsi0hsck_mux_info = {
diff --git a/hw/misc/npcm_clk.c b/hw/misc/npcm_clk.c
index 0e85974cf96..b6a893ffb22 100644
--- a/hw/misc/npcm_clk.c
+++ b/hw/misc/npcm_clk.c
@@ -1108,6 +1108,8 @@ static void npcm7xx_clk_pll_class_init(ObjectClass *klass, void *data)
 
     dc->desc = "NPCM7xx Clock PLL Module";
     dc->vmsd = &vmstate_npcm7xx_clk_pll;
+    /* Reason: Part of NPCMCLKState component */
+    dc->user_creatable = false;
 }
 
 static void npcm7xx_clk_sel_class_init(ObjectClass *klass, void *data)
@@ -1116,6 +1118,8 @@ static void npcm7xx_clk_sel_class_init(ObjectClass *klass, void *data)
 
     dc->desc = "NPCM7xx Clock SEL Module";
     dc->vmsd = &vmstate_npcm7xx_clk_sel;
+    /* Reason: Part of NPCMCLKState component */
+    dc->user_creatable = false;
 }
 
 static void npcm7xx_clk_divider_class_init(ObjectClass *klass, void *data)
@@ -1124,6 +1128,8 @@ static void npcm7xx_clk_divider_class_init(ObjectClass *klass, void *data)
 
     dc->desc = "NPCM7xx Clock Divider Module";
     dc->vmsd = &vmstate_npcm7xx_clk_divider;
+    /* Reason: Part of NPCMCLKState component */
+    dc->user_creatable = false;
 }
 
 static void npcm_clk_class_init(ObjectClass *klass, void *data)
diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c
index fd8466dff34..158b743cae7 100644
--- a/hw/misc/stm32l4x5_rcc.c
+++ b/hw/misc/stm32l4x5_rcc.c
@@ -150,6 +150,8 @@ static void clock_mux_class_init(ObjectClass *klass, void *data)
     rc->phases.hold = clock_mux_reset_hold;
     rc->phases.exit = clock_mux_reset_exit;
     dc->vmsd = &clock_mux_vmstate;
+    /* Reason: Part of Stm32l4x5RccState component */
+    dc->user_creatable = false;
 }
 
 static void clock_mux_set_enable(RccClockMuxState *mux, bool enabled)
@@ -302,6 +304,8 @@ static void pll_class_init(ObjectClass *klass, void *data)
     rc->phases.hold = pll_reset_hold;
     rc->phases.exit = pll_reset_exit;
     dc->vmsd = &pll_vmstate;
+    /* Reason: Part of Stm32l4x5RccState component */
+    dc->user_creatable = false;
 }
 
 static void pll_set_vco_multiplier(RccPllState *pll, uint32_t vco_multiplier)
-- 
2.47.1

[PATCH-for-10.0 09/12] hw/nvram/xlnx-efuse: Do not expose as user-creatable

[Philippe Mathieu-Daudé]

This device is part of SoC components thus can not
be created manually.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/nvram/xlnx-efuse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c
index 29e7dd539ec..176e88fcd17 100644
--- a/hw/nvram/xlnx-efuse.c
+++ b/hw/nvram/xlnx-efuse.c
@@ -280,6 +280,8 @@ static void efuse_class_init(ObjectClass *klass, void *data)
 
     dc->realize = efuse_realize;
     device_class_set_props(dc, efuse_properties);
+    /* Reason: Part of Xilinx SoC */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo efuse_info = {
-- 
2.47.1

[PATCH-for-10.0 10/12] hw/rtc: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/rtc/ds1338.c  | 2 ++
 hw/rtc/m41t80.c  | 2 ++
 hw/rtc/rs5c372.c | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/hw/rtc/ds1338.c b/hw/rtc/ds1338.c
index 8dd17fdc07c..56162917c1b 100644
--- a/hw/rtc/ds1338.c
+++ b/hw/rtc/ds1338.c
@@ -230,6 +230,8 @@ static void ds1338_class_init(ObjectClass *klass, void *data)
     k->send = ds1338_send;
     device_class_set_legacy_reset(dc, ds1338_reset);
     dc->vmsd = &vmstate_ds1338;
+    dc->desc = "Maxim DS1338 RTC";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo ds1338_types[] = {
diff --git a/hw/rtc/m41t80.c b/hw/rtc/m41t80.c
index 96006956798..55f52d95c51 100644
--- a/hw/rtc/m41t80.c
+++ b/hw/rtc/m41t80.c
@@ -99,6 +99,8 @@ static void m41t80_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass);
 
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+    dc->desc = "ST M41T80 RTC";
     dc->realize = m41t80_realize;
     sc->send = m41t80_send;
     sc->recv = m41t80_recv;
diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c
index 5542f74085a..98067ad06d1 100644
--- a/hw/rtc/rs5c372.c
+++ b/hw/rtc/rs5c372.c
@@ -216,6 +216,8 @@ static void rs5c372_class_init(ObjectClass *klass, void *data)
     I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
     ResettableClass *rc = RESETTABLE_CLASS(klass);
 
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+    dc->desc = "Ricoh RS5C372 RTC";
     k->event = rs5c372_event;
     k->recv = rs5c372_recv;
     k->send = rs5c372_send;
-- 
2.47.1

[PATCH-for-10.0 11/12] hw/sensor/temp: Categorize and add description

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/sensor/dps310.c  | 2 ++
 hw/sensor/emc141x.c | 6 ++++++
 hw/sensor/tmp105.c  | 2 ++
 hw/sensor/tmp421.c  | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/hw/sensor/dps310.c b/hw/sensor/dps310.c
index 6966a53248b..e1e6df6b60a 100644
--- a/hw/sensor/dps310.c
+++ b/hw/sensor/dps310.c
@@ -207,6 +207,8 @@ static void dps310_class_init(ObjectClass *klass, void *data)
     k->send = dps310_tx;
     device_class_set_legacy_reset(dc, dps310_reset);
     dc->vmsd = &vmstate_dps310;
+    dc->desc = "Infineon DPS310 temperature and humidity sensor";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo dps310_info = {
diff --git a/hw/sensor/emc141x.c b/hw/sensor/emc141x.c
index 33c1bd330fd..6adb94e7ff5 100644
--- a/hw/sensor/emc141x.c
+++ b/hw/sensor/emc141x.c
@@ -280,19 +280,25 @@ static void emc141x_class_init(ObjectClass *klass, const void *data)
 static void emc1413_class_init(ObjectClass *klass, void *data)
 {
     EMC141XClass *ec = EMC141X_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     emc141x_class_init(klass, data);
     ec->model = EMC1413_DEVICE_ID;
     ec->sensors_count = 3;
+    dc->desc = "SMSC EMC1413 temperature sensor";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static void emc1414_class_init(ObjectClass *klass, void *data)
 {
     EMC141XClass *ec = EMC141X_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     emc141x_class_init(klass, data);
     ec->model = EMC1414_DEVICE_ID;
     ec->sensors_count = 4;
+    dc->desc = "SMSC EMC1414 temperature sensor";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo emc141x_info = {
diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c
index ef2824f3e1b..6a38f2c6670 100644
--- a/hw/sensor/tmp105.c
+++ b/hw/sensor/tmp105.c
@@ -323,6 +323,8 @@ static void tmp105_class_init(ObjectClass *klass, void *data)
     k->recv = tmp105_rx;
     k->send = tmp105_tx;
     dc->vmsd = &vmstate_tmp105;
+    dc->desc = "TI TMP105 temperature sensor";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo tmp105_info = {
diff --git a/hw/sensor/tmp421.c b/hw/sensor/tmp421.c
index 007f7cd018b..ba42ab328e0 100644
--- a/hw/sensor/tmp421.c
+++ b/hw/sensor/tmp421.c
@@ -342,6 +342,7 @@ static void tmp421_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
     TMP421Class *sc = TMP421_CLASS(klass);
+    g_autofree char *name_up = NULL;
 
     dc->realize = tmp421_realize;
     k->event = tmp421_event;
@@ -349,6 +350,9 @@ static void tmp421_class_init(ObjectClass *klass, void *data)
     k->send = tmp421_tx;
     dc->vmsd = &vmstate_tmp421;
     sc->dev = (DeviceInfo *) data;
+    name_up = g_ascii_strup(sc->dev->name, -1);
+    dc->desc = g_strconcat("TI ", name_up, " temperature sensor", NULL);
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 
     object_class_property_add(klass, "temperature0", "int",
                               tmp421_get_temperature,
-- 
2.47.1

[RFC PATCH-for-10.0 12/12] hw/s390x/zpci: Re-categorize as BRIDGE

[Philippe Mathieu-Daudé]

A 'zpci' device encapsulate a PCI device to be usable
by System/Z. Categorize it as bridge.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-pci-bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 2591ee49c11..dbfe24f6eca 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -1562,7 +1562,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);
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
     device_class_set_legacy_reset(dc, s390_pci_device_reset);
     dc->bus_type = TYPE_S390_PCI_BUS;
     dc->realize = s390_pci_device_realize;
-- 
2.47.1

Re: [PATCH-for-10.0 06/12] hw/i2c/pca954x: Categorize and add description

[Corey Minyard]

On Tue, Mar 25, 2025 at 11:43:04PM +0100, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  hw/i2c/i2c_mux_pca954x.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Looks ok to me.

Acked-by: Corey Minyard <cminyard@mvista.com>

> 
> diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c
> index 779cc4e66ed..100b8d86093 100644
> --- a/hw/i2c/i2c_mux_pca954x.c
> +++ b/hw/i2c/i2c_mux_pca954x.c
> @@ -175,12 +175,18 @@ I2CBus *pca954x_i2c_get_bus(I2CSlave *mux, uint8_t channel)
>  static void pca9546_class_init(ObjectClass *klass, void *data)
>  {
>      Pca954xClass *s = PCA954X_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +
> +    dc->desc = "PCA9546 I2C multiplexer";
>      s->nchans = PCA9546_CHANNEL_COUNT;
>  }
>  
>  static void pca9548_class_init(ObjectClass *klass, void *data)
>  {
>      Pca954xClass *s = PCA954X_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +
> +    dc->desc = "PCA9548 I2C multiplexer";
>      s->nchans = PCA9548_CHANNEL_COUNT;
>  }
>  
> @@ -226,13 +232,13 @@ static void pca954x_class_init(ObjectClass *klass, void *data)
>  
>      rc->phases.enter = pca954x_enter_reset;
>  
> -    dc->desc = "Pca954x i2c-mux";
>      dc->realize = pca954x_realize;
>  
>      k->write_data = pca954x_write_data;
>      k->receive_byte = pca954x_read_byte;
>  
>      device_class_set_props(dc, pca954x_props);
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }
>  
>  static const TypeInfo pca954x_info[] = {
> -- 
> 2.47.1
> 
> 

Re: [PATCH-for-10.0 10/12] hw/rtc: Categorize and add description

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 1847 bytes --]

On Tue, 25 Mar 2025, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/rtc/ds1338.c  | 2 ++
> hw/rtc/m41t80.c  | 2 ++
> hw/rtc/rs5c372.c | 2 ++
> 3 files changed, 6 insertions(+)
>
> diff --git a/hw/rtc/ds1338.c b/hw/rtc/ds1338.c
> index 8dd17fdc07c..56162917c1b 100644
> --- a/hw/rtc/ds1338.c
> +++ b/hw/rtc/ds1338.c
> @@ -230,6 +230,8 @@ static void ds1338_class_init(ObjectClass *klass, void *data)
>     k->send = ds1338_send;
>     device_class_set_legacy_reset(dc, ds1338_reset);
>     dc->vmsd = &vmstate_ds1338;
> +    dc->desc = "Maxim DS1338 RTC";
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> }
>
> static const TypeInfo ds1338_types[] = {
> diff --git a/hw/rtc/m41t80.c b/hw/rtc/m41t80.c
> index 96006956798..55f52d95c51 100644
> --- a/hw/rtc/m41t80.c
> +++ b/hw/rtc/m41t80.c
> @@ -99,6 +99,8 @@ static void m41t80_class_init(ObjectClass *klass, void *data)
>     DeviceClass *dc = DEVICE_CLASS(klass);
>     I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass);
>
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

This set_bit() is not needed for i2c devices, i2c_slave_class_init() sets 
that already.

Regards,
BALATON Zoltan

> +    dc->desc = "ST M41T80 RTC";
>     dc->realize = m41t80_realize;
>     sc->send = m41t80_send;
>     sc->recv = m41t80_recv;
> diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c
> index 5542f74085a..98067ad06d1 100644
> --- a/hw/rtc/rs5c372.c
> +++ b/hw/rtc/rs5c372.c
> @@ -216,6 +216,8 @@ static void rs5c372_class_init(ObjectClass *klass, void *data)
>     I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
>     ResettableClass *rc = RESETTABLE_CLASS(klass);
>
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> +    dc->desc = "Ricoh RS5C372 RTC";
>     k->event = rs5c372_event;
>     k->recv = rs5c372_recv;
>     k->send = rs5c372_send;
>

Re: [PATCH-for-10.0 01/12] hw/audio/wm8750: Categorize and add description

[Thomas Huth]

On 25/03/2025 23.42, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/audio/wm8750.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
> index 8d381dbc658..6c1bb20fb75 100644
> --- a/hw/audio/wm8750.c
> +++ b/hw/audio/wm8750.c
> @@ -721,6 +721,8 @@ static void wm8750_class_init(ObjectClass *klass, void *data)
>       sc->send = wm8750_tx;
>       dc->vmsd = &vmstate_wm8750;
>       device_class_set_props(dc, wm8750_properties);
> +    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
> +    dc->desc = "WM8750 Stereo CODEC";
>   }
>   
>   static const TypeInfo wm8750_info = {

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

Re: [RFC PATCH-for-10.0 12/12] hw/s390x/zpci: Re-categorize as BRIDGE

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> A 'zpci' device encapsulate a PCI device to be usable
> by System/Z. Categorize it as bridge.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/s390-pci-bus.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
> index 2591ee49c11..dbfe24f6eca 100644
> --- a/hw/s390x/s390-pci-bus.c
> +++ b/hw/s390x/s390-pci-bus.c
> @@ -1562,7 +1562,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);
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

It's not really a bridge (in the sense of a PCI bridge) ... I think it's 
maybe better to keep it in the MISC category to avoid confusion.

  Thomas

Re: [PATCH-for-10.0 01/12] hw/audio/wm8750: Categorize and add description

[Thomas Huth]

On 26/03/2025 07.47, Thomas Huth wrote:
> On 25/03/2025 23.42, Philippe Mathieu-Daudé wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   hw/audio/wm8750.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
>> index 8d381dbc658..6c1bb20fb75 100644
>> --- a/hw/audio/wm8750.c
>> +++ b/hw/audio/wm8750.c
>> @@ -721,6 +721,8 @@ static void wm8750_class_init(ObjectClass *klass, void 
>> *data)
>>       sc->send = wm8750_tx;
>>       dc->vmsd = &vmstate_wm8750;
>>       device_class_set_props(dc, wm8750_properties);
>> +    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
>> +    dc->desc = "WM8750 Stereo CODEC";
>>   }
>>   static const TypeInfo wm8750_info = {
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Looking at this twice, I think the patch is not OK in its current shape: The 
wm8750 device now shows up twice in the output of "-device help", once in 
the "Sound" category and once in the "Misc" category (inherited from I2C 
device). That's somewhat ugly. I guess you'd need to remove the MISC bit 
here to clean that up?

  Thomas

Re: [PATCH-for-10.0 02/12] hw/block/m25p80: Categorize and add description

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/block/m25p80.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
> index b84c6afb327..0887c103e4f 100644
> --- a/hw/block/m25p80.c
> +++ b/hw/block/m25p80.c
> @@ -1870,7 +1870,9 @@ static void m25p80_class_init(ObjectClass *klass, void *data)
>       dc->vmsd = &vmstate_m25p80;
>       device_class_set_props(dc, m25p80_properties);
>       device_class_set_legacy_reset(dc, m25p80_reset);
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>       mc->pi = data;
> +    dc->desc = "Serial Flash";
>   }
>   
>   static const TypeInfo m25p80_info = {

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

Re: [PATCH-for-10.0 03/12] hw/display/dm163: Add description

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/display/dm163.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/display/dm163.c b/hw/display/dm163.c
> index 75a91f62bd3..f6f0ec0c632 100644
> --- a/hw/display/dm163.c
> +++ b/hw/display/dm163.c
> @@ -330,7 +330,7 @@ static void dm163_class_init(ObjectClass *klass, void *data)
>       DeviceClass *dc = DEVICE_CLASS(klass);
>       ResettableClass *rc = RESETTABLE_CLASS(klass);
>   
> -    dc->desc = "DM163";
> +    dc->desc = "DM163 8x3-channel constant current LED driver";
>       dc->vmsd = &vmstate_dm163;
>       dc->realize = dm163_realize;
>       rc->phases.hold = dm163_reset_hold;

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

Re: [PATCH-for-10.0 04/12] hw/dma/i82374: Categorize and add description

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/dma/i82374.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
> index 9652d47adcd..0bf69ef399b 100644
> --- a/hw/dma/i82374.c
> +++ b/hw/dma/i82374.c
> @@ -150,6 +150,8 @@ static void i82374_class_init(ObjectClass *klass, void *data)
>       dc->realize = i82374_realize;
>       dc->vmsd = &vmstate_i82374;
>       device_class_set_props(dc, i82374_properties);
> +    dc->desc = "Intel 82374 DMA controller";
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>   }
>   
>   static const TypeInfo i82374_info = {

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

Re: [PATCH-for-10.0 05/12] hw/gpio/pca9552: Categorize and add description

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/gpio/pca9552.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c
> index 1ac0cf6c464..b152872f6c6 100644
> --- a/hw/gpio/pca9552.c
> +++ b/hw/gpio/pca9552.c
> @@ -459,6 +459,8 @@ static void pca9552_class_init(ObjectClass *oc, void *data)
>       DeviceClass *dc = DEVICE_CLASS(oc);
>       PCA955xClass *pc = PCA955X_CLASS(oc);
>   
> +    dc->desc = "PCA9552 LED blinker";
> +    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
>       device_class_set_legacy_reset(dc, pca9552_reset);
>       dc->vmsd = &pca9552_vmstate;
>       pc->max_reg = PCA9552_LS3;

I2C device - same problem as in patch 1 : Unset MISC category here?

  Thomas

Re: [PATCH-for-10.0 06/12] hw/i2c/pca954x: Categorize and add description

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/i2c/i2c_mux_pca954x.c | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c
> index 779cc4e66ed..100b8d86093 100644
> --- a/hw/i2c/i2c_mux_pca954x.c
> +++ b/hw/i2c/i2c_mux_pca954x.c
> @@ -175,12 +175,18 @@ I2CBus *pca954x_i2c_get_bus(I2CSlave *mux, uint8_t channel)
>   static void pca9546_class_init(ObjectClass *klass, void *data)
>   {
>       Pca954xClass *s = PCA954X_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +
> +    dc->desc = "PCA9546 I2C multiplexer";
>       s->nchans = PCA9546_CHANNEL_COUNT;
>   }
>   
>   static void pca9548_class_init(ObjectClass *klass, void *data)
>   {
>       Pca954xClass *s = PCA954X_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +
> +    dc->desc = "PCA9548 I2C multiplexer";
>       s->nchans = PCA9548_CHANNEL_COUNT;
>   }
>   
> @@ -226,13 +232,13 @@ static void pca954x_class_init(ObjectClass *klass, void *data)
>   
>       rc->phases.enter = pca954x_enter_reset;
>   
> -    dc->desc = "Pca954x i2c-mux";
>       dc->realize = pca954x_realize;
>   
>       k->write_data = pca954x_write_data;
>       k->receive_byte = pca954x_read_byte;
>   
>       device_class_set_props(dc, pca954x_props);
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

Clear DEVICE_CATEGORY_MISC ?

  Thomas

Re: [PATCH-for-10.0 07/12] hw/misc/axp2xx: Categorize and add description

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/axp2xx.c | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/hw/misc/axp2xx.c b/hw/misc/axp2xx.c
> index af646878cd2..747af430479 100644
> --- a/hw/misc/axp2xx.c
> +++ b/hw/misc/axp2xx.c
> @@ -232,6 +232,7 @@ static void axp2xx_class_init(ObjectClass *oc, void *data)
>       ResettableClass *rc = RESETTABLE_CLASS(oc);
>   
>       rc->phases.enter = axp2xx_reset_enter;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

That should not be necessary - since I2C devices are in the MISC category by 
default.

  Thomas



>       dc->vmsd = &vmstate_axp2xx;
>       isc->event = axp2xx_event;
>       isc->recv = axp2xx_rx;
> @@ -250,7 +251,9 @@ static const TypeInfo axp2xx_info = {
>   static void axp209_class_init(ObjectClass *oc, void *data)
>   {
>       AXP2xxClass *sc = AXP2XX_CLASS(oc);
> +    DeviceClass *dc = DEVICE_CLASS(oc);
>   
> +    dc->desc = "AXP209 power system management";
>       sc->reset_enter = axp209_reset_enter;
>   }
>   
> @@ -263,7 +266,9 @@ static const TypeInfo axp209_info = {
>   static void axp221_class_init(ObjectClass *oc, void *data)
>   {
>       AXP2xxClass *sc = AXP2XX_CLASS(oc);
> +    DeviceClass *dc = DEVICE_CLASS(oc);
>   
> +    dc->desc = "AXP221 power system management";
>       sc->reset_enter = axp221_reset_enter;
>   }
>   

Re: [PATCH-for-10.0 08/12] hw/misc/pll: Do not expose as user-creatable

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> All these devices are part of SoC components and can not
> be created manually.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/bcm2835_cprman.c | 8 ++++++++
>   hw/misc/npcm_clk.c       | 6 ++++++
>   hw/misc/stm32l4x5_rcc.c  | 4 ++++
>   3 files changed, 18 insertions(+)

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

Re: [PATCH-for-10.0 09/12] hw/nvram/xlnx-efuse: Do not expose as user-creatable

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> This device is part of SoC components thus can not
> be created manually.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/nvram/xlnx-efuse.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c
> index 29e7dd539ec..176e88fcd17 100644
> --- a/hw/nvram/xlnx-efuse.c
> +++ b/hw/nvram/xlnx-efuse.c
> @@ -280,6 +280,8 @@ static void efuse_class_init(ObjectClass *klass, void *data)
>   
>       dc->realize = efuse_realize;
>       device_class_set_props(dc, efuse_properties);
> +    /* Reason: Part of Xilinx SoC */
> +    dc->user_creatable = false;
>   }
>   
>   static const TypeInfo efuse_info = {

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

Re: [PATCH-for-10.0 11/12] hw/sensor/temp: Categorize and add description

[Thomas Huth]

On 25/03/2025 23.43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/sensor/dps310.c  | 2 ++
>   hw/sensor/emc141x.c | 6 ++++++
>   hw/sensor/tmp105.c  | 2 ++
>   hw/sensor/tmp421.c  | 4 ++++
>   4 files changed, 14 insertions(+)
> 
> diff --git a/hw/sensor/dps310.c b/hw/sensor/dps310.c
> index 6966a53248b..e1e6df6b60a 100644
> --- a/hw/sensor/dps310.c
> +++ b/hw/sensor/dps310.c
> @@ -207,6 +207,8 @@ static void dps310_class_init(ObjectClass *klass, void *data)
>       k->send = dps310_tx;
>       device_class_set_legacy_reset(dc, dps310_reset);
>       dc->vmsd = &vmstate_dps310;
> +    dc->desc = "Infineon DPS310 temperature and humidity sensor";
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

Not necessary - I2C device again.

  Thomas

Re: [PATCH-for-10.0 01/12] hw/audio/wm8750: Categorize and add description

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]

On Wed, 26 Mar 2025, Thomas Huth wrote:
> On 26/03/2025 07.47, Thomas Huth wrote:
>> On 25/03/2025 23.42, Philippe Mathieu-Daudé wrote:
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>> ---
>>>   hw/audio/wm8750.c | 2 ++
>>>   1 file changed, 2 insertions(+)
>>> 
>>> diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
>>> index 8d381dbc658..6c1bb20fb75 100644
>>> --- a/hw/audio/wm8750.c
>>> +++ b/hw/audio/wm8750.c
>>> @@ -721,6 +721,8 @@ static void wm8750_class_init(ObjectClass *klass, void 
>>> *data)
>>>       sc->send = wm8750_tx;
>>>       dc->vmsd = &vmstate_wm8750;
>>>       device_class_set_props(dc, wm8750_properties);
>>> +    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
>>> +    dc->desc = "WM8750 Stereo CODEC";
>>>   }
>>>   static const TypeInfo wm8750_info = {
>> 
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
> Looking at this twice, I think the patch is not OK in its current shape: The 
> wm8750 device now shows up twice in the output of "-device help", once in the 
> "Sound" category and once in the "Misc" category (inherited from I2C device). 
> That's somewhat ugly. I guess you'd need to remove the MISC bit here to clean 
> that up?

Maybe we could add an i2c category for those devices? But in this case it 
fits in multiple categories.

Regards,
BALATON Zoltan

Re: [PATCH-for-10.0 01/12] hw/audio/wm8750: Categorize and add description

[Thomas Huth]

On 26/03/2025 13.39, BALATON Zoltan wrote:
> On Wed, 26 Mar 2025, Thomas Huth wrote:
>> On 26/03/2025 07.47, Thomas Huth wrote:
>>> On 25/03/2025 23.42, Philippe Mathieu-Daudé wrote:
>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>>> ---
>>>>   hw/audio/wm8750.c | 2 ++
>>>>   1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
>>>> index 8d381dbc658..6c1bb20fb75 100644
>>>> --- a/hw/audio/wm8750.c
>>>> +++ b/hw/audio/wm8750.c
>>>> @@ -721,6 +721,8 @@ static void wm8750_class_init(ObjectClass *klass, 
>>>> void *data)
>>>>       sc->send = wm8750_tx;
>>>>       dc->vmsd = &vmstate_wm8750;
>>>>       device_class_set_props(dc, wm8750_properties);
>>>> +    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
>>>> +    dc->desc = "WM8750 Stereo CODEC";
>>>>   }
>>>>   static const TypeInfo wm8750_info = {
>>>
>>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>>
>> Looking at this twice, I think the patch is not OK in its current shape: 
>> The wm8750 device now shows up twice in the output of "-device help", once 
>> in the "Sound" category and once in the "Misc" category (inherited from 
>> I2C device). That's somewhat ugly. I guess you'd need to remove the MISC 
>> bit here to clean that up?
> 
> Maybe we could add an i2c category for those devices? But in this case it 
> fits in multiple categories.

I think we should aim for the most specific category only. For example, we 
also have things like "usb-mouse" or "usb-tablet", but these only show up in 
the "input" category, and not in the "USB device" category.

By the way, it's somewhat weird that we have a USB category, but not a PCI 
or I2C category ... maybe we should rather get rid of that USB category and 
classify the HCDs as "controller/bridges" like we do it for the PCI host 
controllers?

  Thomas

Re: [PATCH-for-10.0 10/12] hw/rtc: Categorize and add description

[Bernhard Beschow]

Am 25. März 2025 22:43:08 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>---
> hw/rtc/ds1338.c  | 2 ++
> hw/rtc/m41t80.c  | 2 ++
> hw/rtc/rs5c372.c | 2 ++

For rs5c372:
Acked-by: Bernhard Beschow <shentey@gmail.com>

> 3 files changed, 6 insertions(+)
>
>diff --git a/hw/rtc/ds1338.c b/hw/rtc/ds1338.c
>index 8dd17fdc07c..56162917c1b 100644
>--- a/hw/rtc/ds1338.c
>+++ b/hw/rtc/ds1338.c
>@@ -230,6 +230,8 @@ static void ds1338_class_init(ObjectClass *klass, void *data)
>     k->send = ds1338_send;
>     device_class_set_legacy_reset(dc, ds1338_reset);
>     dc->vmsd = &vmstate_ds1338;
>+    dc->desc = "Maxim DS1338 RTC";
>+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> }
> 
> static const TypeInfo ds1338_types[] = {
>diff --git a/hw/rtc/m41t80.c b/hw/rtc/m41t80.c
>index 96006956798..55f52d95c51 100644
>--- a/hw/rtc/m41t80.c
>+++ b/hw/rtc/m41t80.c
>@@ -99,6 +99,8 @@ static void m41t80_class_init(ObjectClass *klass, void *data)
>     DeviceClass *dc = DEVICE_CLASS(klass);
>     I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass);
> 
>+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>+    dc->desc = "ST M41T80 RTC";
>     dc->realize = m41t80_realize;
>     sc->send = m41t80_send;
>     sc->recv = m41t80_recv;
>diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c
>index 5542f74085a..98067ad06d1 100644
>--- a/hw/rtc/rs5c372.c
>+++ b/hw/rtc/rs5c372.c
>@@ -216,6 +216,8 @@ static void rs5c372_class_init(ObjectClass *klass, void *data)
>     I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
>     ResettableClass *rc = RESETTABLE_CLASS(klass);
> 
>+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>+    dc->desc = "Ricoh RS5C372 RTC";
>     k->event = rs5c372_event;
>     k->recv = rs5c372_recv;
>     k->send = rs5c372_send;

Re: [PATCH-for-10.0 00/12] hw: Categorize few devices and add their descriptions

[Philippe Mathieu-Daudé]

On 25/3/25 23:42, Philippe Mathieu-Daudé wrote:

> Philippe Mathieu-Daudé (12):

>    hw/block/m25p80: Categorize and add description
>    hw/display/dm163: Add description
>    hw/dma/i82374: Categorize and add description

>    hw/misc/pll: Do not expose as user-creatable
>    hw/nvram/xlnx-efuse: Do not expose as user-creatable

Patches 2-4 and 8-9 queued.