[Qemu-devel] [PATCH 00/10][TRIVIAL] Define categories for some PPC devices

[Qemu-devel] [PATCH 00/10][TRIVIAL] Define categories for some PPC devices

[Laurent Vivier]

Some PPC devices appear uncategorized in the output of
"-device ?". This series tries to categorize some of
them.

Laurent Vivier (10):
  adb: add to input category
  cmd646: add to storage category
  escc: add to input category
  grackle: add to bridge category
  cuda: add to bridge category
  macio-ide: add to storage category
  uninorth: add to bridge category
  macio: add to bridge category
  macio-nvram: add to misc category
  openpic: add to misc category

 hw/char/escc.c         | 1 +
 hw/ide/cmd646.c        | 1 +
 hw/ide/macio.c         | 1 +
 hw/input/adb.c         | 2 ++
 hw/intc/openpic.c      | 1 +
 hw/intc/openpic_kvm.c  | 1 +
 hw/misc/macio/cuda.c   | 1 +
 hw/misc/macio/macio.c  | 1 +
 hw/nvram/mac_nvram.c   | 1 +
 hw/pci-host/grackle.c  | 2 ++
 hw/pci-host/uninorth.c | 8 ++++++++
 11 files changed, 20 insertions(+)

-- 
2.4.3

[Qemu-devel] [PATCH 01/10][TRIVIAL] adb: add to input category

[Laurent Vivier]

The Apple Desktop Bus is used to connect a keyboard and a mouse,
so add it to the input category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/input/adb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/input/adb.c b/hw/input/adb.c
index a18eea2..09eead9 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -362,6 +362,7 @@ static void adb_kbd_class_init(ObjectClass *oc, void *data)
 
     akc->parent_realize = dc->realize;
     dc->realize = adb_kbd_realizefn;
+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 
     adc->devreq = adb_kbd_request;
     dc->reset = adb_kbd_reset;
@@ -566,6 +567,7 @@ static void adb_mouse_class_init(ObjectClass *oc, void *data)
 
     amc->parent_realize = dc->realize;
     dc->realize = adb_mouse_realizefn;
+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 
     adc->devreq = adb_mouse_request;
     dc->reset = adb_mouse_reset;
-- 
2.4.3

[Qemu-devel] [PATCH 02/10][TRIVIAL] cmd646: add to storage category

[Laurent Vivier]

cmd646 is an IDE controller, so add it to the
storage category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/ide/cmd646.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 66fb9d9..27f3da2 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -417,6 +417,7 @@ static void cmd646_ide_class_init(ObjectClass *klass, void *data)
     k->config_read = cmd646_pci_config_read;
     k->config_write = cmd646_pci_config_write;
     dc->props = cmd646_ide_properties;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static const TypeInfo cmd646_ide_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 03/10][TRIVIAL] escc: add to input category

[Laurent Vivier]

ESCC is a serial port controller, so add it
to the input category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/char/escc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/char/escc.c b/hw/char/escc.c
index ba653ef..9816154 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -1035,6 +1035,7 @@ static void escc_class_init(ObjectClass *klass, void *data)
     dc->reset = escc_reset;
     dc->vmsd = &vmstate_escc;
     dc->props = escc_properties;
+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 }
 
 static const TypeInfo escc_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 04/10][TRIVIAL] grackle: add to bridge category

[Laurent Vivier]

Grackle is the PCI host controller of oldworld powermac,
so add it to the bridge category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/pci-host/grackle.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index bfe707a..ea31b72 100644
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -146,8 +146,10 @@ static const TypeInfo grackle_pci_info = {
 static void pci_grackle_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     k->init = pci_grackle_init_device;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo grackle_pci_host_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 05/10][TRIVIAL] cuda: add to bridge category

[Laurent Vivier]

Cuda is a bridge between PowerMac system bus and the ADB controller,
real-time clock, pram and the power management unit.

So add it to the bridge category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/misc/macio/cuda.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index f3984e3..4648458 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -738,6 +738,7 @@ static void cuda_class_init(ObjectClass *oc, void *data)
     dc->reset = cuda_reset;
     dc->vmsd = &vmstate_cuda;
     dc->props = cuda_properties;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo cuda_type_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 06/10][TRIVIAL] macio-ide: add to storage category

[Laurent Vivier]

macio-ide is an IDE controller, so add it
to the storage category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/ide/macio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 66ac2ba..893c9b9 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -590,6 +590,7 @@ static void macio_ide_class_init(ObjectClass *oc, void *data)
     dc->realize = macio_ide_realizefn;
     dc->reset = macio_ide_reset;
     dc->vmsd = &vmstate_pmac;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
 static const TypeInfo macio_ide_type_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 07/10][TRIVIAL] uninorth: add to bridge category

[Laurent Vivier]

Uninorth is the mac99 PCI host controller, so add
it to the bridge category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/pci-host/uninorth.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index f0144eb..215b64f 100644
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -446,8 +446,10 @@ static const TypeInfo unin_internal_pci_host_info = {
 static void pci_unin_main_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     sbc->init = pci_unin_main_init_device;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo pci_unin_main_info = {
@@ -460,8 +462,10 @@ static const TypeInfo pci_unin_main_info = {
 static void pci_u3_agp_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     sbc->init = pci_u3_agp_init_device;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo pci_u3_agp_info = {
@@ -474,8 +478,10 @@ static const TypeInfo pci_u3_agp_info = {
 static void pci_unin_agp_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     sbc->init = pci_unin_agp_init_device;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo pci_unin_agp_info = {
@@ -488,8 +494,10 @@ static const TypeInfo pci_unin_agp_info = {
 static void pci_unin_internal_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
+    DeviceClass *dc = DEVICE_CLASS(klass);
 
     sbc->init = pci_unin_internal_init_device;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo pci_unin_internal_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 08/10][TRIVIAL] macio: add to bridge category

[Laurent Vivier]

macio is a bridge between the PCI bus and the Mac nvram,
IDE controller and PIC, so add it to the bridge category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/misc/macio/macio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index e3c0242..c0989a0 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -393,6 +393,7 @@ static void macio_class_init(ObjectClass *klass, void *data)
     k->vendor_id = PCI_VENDOR_ID_APPLE;
     k->class_id = PCI_CLASS_OTHERS << 8;
     dc->props = macio_properties;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
 static const TypeInfo macio_oldworld_type_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 09/10][TRIVIAL] macio-nvram: add to misc category

[Laurent Vivier]

The macio nvram is a non volatile RAM, so add it
the misc category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/nvram/mac_nvram.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index d35f8a3..9f16566 100644
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -123,6 +123,7 @@ static void macio_nvram_class_init(ObjectClass *oc, void *data)
     dc->reset = macio_nvram_reset;
     dc->vmsd = &vmstate_macio_nvram;
     dc->props = macio_nvram_properties;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo macio_nvram_type_info = {
-- 
2.4.3

[Qemu-devel] [PATCH 10/10][TRIVIAL] openpic: add to misc category

[Laurent Vivier]

openpic is a programmable interrupt controller, so
add it to the misc category.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/intc/openpic.c     | 1 +
 hw/intc/openpic_kvm.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 14ab0e3..bfcf155 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -1643,6 +1643,7 @@ static void openpic_class_init(ObjectClass *oc, void *data)
     dc->props = openpic_properties;
     dc->reset = openpic_reset;
     dc->vmsd = &vmstate_openpic;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo openpic_info = {
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index f7cac58..649f476 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -275,6 +275,7 @@ static void kvm_openpic_class_init(ObjectClass *oc, void *data)
     dc->realize = kvm_openpic_realize;
     dc->props = kvm_openpic_properties;
     dc->reset = kvm_openpic_reset;
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 }
 
 static const TypeInfo kvm_openpic_info = {
-- 
2.4.3

Re: [Qemu-devel] [PATCH 01/10][TRIVIAL] adb: add to input category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> The Apple Desktop Bus is used to connect a keyboard and a mouse,
> so add it to the input category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/input/adb.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/input/adb.c b/hw/input/adb.c
> index a18eea2..09eead9 100644
> --- a/hw/input/adb.c
> +++ b/hw/input/adb.c
> @@ -362,6 +362,7 @@ static void adb_kbd_class_init(ObjectClass *oc, void *data)
>  
>      akc->parent_realize = dc->realize;
>      dc->realize = adb_kbd_realizefn;
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  
>      adc->devreq = adb_kbd_request;
>      dc->reset = adb_kbd_reset;
> @@ -566,6 +567,7 @@ static void adb_mouse_class_init(ObjectClass *oc, void *data)
>  
>      amc->parent_realize = dc->realize;
>      dc->realize = adb_mouse_realizefn;
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  
>      adc->devreq = adb_mouse_request;
>      dc->reset = adb_mouse_reset;

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

Re: [Qemu-devel] [PATCH 02/10][TRIVIAL] cmd646: add to storage category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> cmd646 is an IDE controller, so add it to the
> storage category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/ide/cmd646.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
> index 66fb9d9..27f3da2 100644
> --- a/hw/ide/cmd646.c
> +++ b/hw/ide/cmd646.c
> @@ -417,6 +417,7 @@ static void cmd646_ide_class_init(ObjectClass *klass, void *data)
>      k->config_read = cmd646_pci_config_read;
>      k->config_write = cmd646_pci_config_write;
>      dc->props = cmd646_ide_properties;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 03/10][TRIVIAL] escc: add to input category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> ESCC is a serial port controller, so add it
> to the input category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/char/escc.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/char/escc.c b/hw/char/escc.c
> index ba653ef..9816154 100644
> --- a/hw/char/escc.c
> +++ b/hw/char/escc.c
> @@ -1035,6 +1035,7 @@ static void escc_class_init(ObjectClass *klass, void *data)
>      dc->reset = escc_reset;
>      dc->vmsd = &vmstate_escc;
>      dc->props = escc_properties;
> +    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 06/10][TRIVIAL] macio-ide: add to storage category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> macio-ide is an IDE controller, so add it
> to the storage category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/ide/macio.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ide/macio.c b/hw/ide/macio.c
> index 66ac2ba..893c9b9 100644
> --- a/hw/ide/macio.c
> +++ b/hw/ide/macio.c
> @@ -590,6 +590,7 @@ static void macio_ide_class_init(ObjectClass *oc, void *data)
>      dc->realize = macio_ide_realizefn;
>      dc->reset = macio_ide_reset;
>      dc->vmsd = &vmstate_pmac;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 04/10][TRIVIAL] grackle: add to bridge category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> Grackle is the PCI host controller of oldworld powermac,
> so add it to the bridge category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/pci-host/grackle.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
> index bfe707a..ea31b72 100644
> --- a/hw/pci-host/grackle.c
> +++ b/hw/pci-host/grackle.c
> @@ -146,8 +146,10 @@ static const TypeInfo grackle_pci_info = {
>  static void pci_grackle_class_init(ObjectClass *klass, void *data)
>  {
>      SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
>  
>      k->init = pci_grackle_init_device;
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 07/10][TRIVIAL] uninorth: add to bridge category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> Uninorth is the mac99 PCI host controller, so add
> it to the bridge category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/pci-host/uninorth.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
> index f0144eb..215b64f 100644
> --- a/hw/pci-host/uninorth.c
> +++ b/hw/pci-host/uninorth.c
> @@ -446,8 +446,10 @@ static const TypeInfo unin_internal_pci_host_info = {
>  static void pci_unin_main_class_init(ObjectClass *klass, void *data)
>  {
>      SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
>  
>      sbc->init = pci_unin_main_init_device;
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }
>  
>  static const TypeInfo pci_unin_main_info = {
> @@ -460,8 +462,10 @@ static const TypeInfo pci_unin_main_info = {
>  static void pci_u3_agp_class_init(ObjectClass *klass, void *data)
>  {
>      SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
>  
>      sbc->init = pci_u3_agp_init_device;
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }
>  
>  static const TypeInfo pci_u3_agp_info = {
> @@ -474,8 +478,10 @@ static const TypeInfo pci_u3_agp_info = {
>  static void pci_unin_agp_class_init(ObjectClass *klass, void *data)
>  {
>      SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
>  
>      sbc->init = pci_unin_agp_init_device;
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }
>  
>  static const TypeInfo pci_unin_agp_info = {
> @@ -488,8 +494,10 @@ static const TypeInfo pci_unin_agp_info = {
>  static void pci_unin_internal_class_init(ObjectClass *klass, void *data)
>  {
>      SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
>  
>      sbc->init = pci_unin_internal_init_device;
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 08/10][TRIVIAL] macio: add to bridge category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> macio is a bridge between the PCI bus and the Mac nvram,
> IDE controller and PIC, so add it to the bridge category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/misc/macio/macio.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index e3c0242..c0989a0 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -393,6 +393,7 @@ static void macio_class_init(ObjectClass *klass, void *data)
>      k->vendor_id = PCI_VENDOR_ID_APPLE;
>      k->class_id = PCI_CLASS_OTHERS << 8;
>      dc->props = macio_properties;
> +    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 09/10][TRIVIAL] macio-nvram: add to misc category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> The macio nvram is a non volatile RAM, so add it
> the misc category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/nvram/mac_nvram.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
> index d35f8a3..9f16566 100644
> --- a/hw/nvram/mac_nvram.c
> +++ b/hw/nvram/mac_nvram.c
> @@ -123,6 +123,7 @@ static void macio_nvram_class_init(ObjectClass *oc, void *data)
>      dc->reset = macio_nvram_reset;
>      dc->vmsd = &vmstate_macio_nvram;
>      dc->props = macio_nvram_properties;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 10/10][TRIVIAL] openpic: add to misc category

[Thomas Huth]

On 26/09/15 18:22, Laurent Vivier wrote:
> openpic is a programmable interrupt controller, so
> add it to the misc category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/intc/openpic.c     | 1 +
>  hw/intc/openpic_kvm.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
> index 14ab0e3..bfcf155 100644
> --- a/hw/intc/openpic.c
> +++ b/hw/intc/openpic.c
> @@ -1643,6 +1643,7 @@ static void openpic_class_init(ObjectClass *oc, void *data)
>      dc->props = openpic_properties;
>      dc->reset = openpic_reset;
>      dc->vmsd = &vmstate_openpic;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }
>  
>  static const TypeInfo openpic_info = {
> diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
> index f7cac58..649f476 100644
> --- a/hw/intc/openpic_kvm.c
> +++ b/hw/intc/openpic_kvm.c
> @@ -275,6 +275,7 @@ static void kvm_openpic_class_init(ObjectClass *oc, void *data)
>      dc->realize = kvm_openpic_realize;
>      dc->props = kvm_openpic_properties;
>      dc->reset = kvm_openpic_reset;
> +    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
>  }

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

Re: [Qemu-devel] [PATCH 06/10][TRIVIAL] macio-ide: add to storage category

[John Snow]

On 09/26/2015 12:22 PM, Laurent Vivier wrote:
> macio-ide is an IDE controller, so add it
> to the storage category.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  hw/ide/macio.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ide/macio.c b/hw/ide/macio.c
> index 66ac2ba..893c9b9 100644
> --- a/hw/ide/macio.c
> +++ b/hw/ide/macio.c
> @@ -590,6 +590,7 @@ static void macio_ide_class_init(ObjectClass *oc, void *data)
>      dc->realize = macio_ide_realizefn;
>      dc->reset = macio_ide_reset;
>      dc->vmsd = &vmstate_pmac;
> +    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>  }
>  
>  static const TypeInfo macio_ide_type_info = {
> 

Thanks,

Reviewed-by: John Snow <jsnow@redhat.com>

I'll leave this to be staged by whomever stages the entire series.

--js

Re: [Qemu-devel] [Qemu-ppc] [PATCH 00/10][TRIVIAL] Define categories for some PPC devices

[David Gibson]

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

On Sat, Sep 26, 2015 at 06:22:02PM +0200, Laurent Vivier wrote:
> Some PPC devices appear uncategorized in the output of
> "-device ?". This series tries to categorize some of
> them.

These all look good to me.

I've merged them to a new 'ppc-next' staging branch at
git://github.com/dgibson/qemu.git

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]