From 2fecbf68b60416c352ded3ea496028b477cce6b4 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Wed, 6 Nov 2013 14:41:09 +0100

Subject: [PATCH 33/81] devices: Associate devices to their logical category

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <1383748882-22831-5-git-send-email-kwolf@redhat.com>

Patchwork-id: 55530

O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 04/17] devices: Associate devices to their logical category

Bugzilla: 1001216

RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Marcel Apfelbaum <marcel.a@redhat.com>

The category will be used to sort the devices displayed in

the command line help.

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>

Message-id: 1375107465-25767-4-git-send-email-marcel.a@redhat.com

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

(cherry picked from commit 125ee0ed9cad04307498ac2b7b0d51ad8a807360)

Conflicts:

	hw/audio/adlib.c

	hw/audio/cs4231a.c

	hw/audio/gus.c

	hw/audio/pcspk.c

	hw/audio/sb16.c

	hw/block/nvme.c

	hw/misc/pc-testdev.c

	hw/misc/sga.c

	hw/pci-bridge/i82801b11.c

	hw/usb/hcd-ehci-sysbus.c

	hw/usb/hcd-ohci.c

	hw/virtio/virtio-mmio.c

Trivial conflicts in

* ISA devices because we don't have commit db895a1 "isa: Use realizefn

  for ISADevice"

* i82801b11.c because we backported commit 4965b7f out of order, as

  commit ccf2798

* hcd-ehci-sysbus because we don't have commit 20c5704 "usb/hcd-ehci:

  Add Tegra2 SysBus EHCI device" and commit 4e3d8b4 "usb/hcd-ehci: Add

  Faraday FUSBH200 support"

* hcd-ohci.c because we don't have commit 457215e "ohci: Use QOM

  realize for OHCI"

* nvme.c and virtio-mmio.c because we don't have them

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

 hw/9pfs/virtio-9p-device.c         | 1 +

 hw/audio/ac97.c                    | 1 +

 hw/audio/adlib.c                   | 1 +

 hw/audio/cs4231a.c                 | 1 +

 hw/audio/es1370.c                  | 1 +

 hw/audio/gus.c                     | 1 +

 hw/audio/hda-codec.c               | 3 +++

 hw/audio/intel-hda.c               | 3 +++

 hw/audio/pcspk.c                   | 1 +

 hw/audio/pl041.c                   | 1 +

 hw/audio/sb16.c                    | 1 +

 hw/block/fdc.c                     | 3 +++

 hw/block/pc_sysfw.c                | 1 +

 hw/block/pflash_cfi01.c            | 1 +

 hw/block/virtio-blk.c              | 1 +

 hw/char/debugcon.c                 | 1 +

 hw/char/imx_serial.c               | 1 +

 hw/char/ipack.c                    | 1 +

 hw/char/ipoctal232.c               | 1 +

 hw/char/parallel.c                 | 1 +

 hw/char/serial-isa.c               | 1 +

 hw/char/serial-pci.c               | 3 +++

 hw/char/tpci200.c                  | 1 +

 hw/char/virtio-serial-bus.c        | 2 ++

 hw/cpu/icc_bus.c                   | 8 ++++++++

 hw/display/cirrus_vga.c            | 2 ++

 hw/display/g364fb.c                | 1 +

 hw/display/pl110.c                 | 3 +++

 hw/display/qxl.c                   | 2 ++

 hw/display/vga-isa.c               | 1 +

 hw/display/vga-pci.c               | 1 +

 hw/display/vmware_vga.c            | 1 +

 hw/i2c/bitbang_i2c.c               | 1 +

 hw/i2c/core.c                      | 1 +

 hw/i386/kvm/pci-assign.c           | 1 +

 hw/ide/ahci.c                      | 1 +

 hw/ide/ich.c                       | 1 +

 hw/ide/isa.c                       | 1 +

 hw/ide/piix.c                      | 3 +++

 hw/ide/qdev.c                      | 1 +

 hw/ide/via.c                       | 1 +

 hw/isa/i82378.c                    | 1 +

 hw/isa/lpc_ich9.c                  | 1 +

 hw/isa/vt82c686.c                  | 3 +++

 hw/misc/applesmc.c                 | 1 +

 hw/misc/debugexit.c                | 1 +

 hw/misc/ivshmem.c                  | 1 +

 hw/misc/pc-testdev.c               | 2 ++

 hw/misc/pci-testdev.c              | 1 +

 hw/misc/sga.c                      | 1 +

 hw/misc/vfio.c                     | 1 +

 hw/net/e1000.c                     | 1 +

 hw/net/eepro100.c                  | 1 +

 hw/net/lance.c                     | 1 +

 hw/net/mipsnet.c                   | 1 +

 hw/net/ne2000-isa.c                | 1 +

 hw/net/ne2000.c                    | 1 +

 hw/net/opencores_eth.c             | 1 +

 hw/net/pcnet-pci.c                 | 1 +

 hw/net/rtl8139.c                   | 1 +

 hw/net/virtio-net.c                | 1 +

 hw/net/vmxnet3.c                   | 1 +

 hw/pci-bridge/i82801b11.c          | 2 ++

 hw/pci-bridge/ioh3420.c            | 1 +

 hw/pci-bridge/pci_bridge_dev.c     | 1 +

 hw/pci-bridge/xio3130_downstream.c | 1 +

 hw/pci-bridge/xio3130_upstream.c   | 1 +

 hw/pci-host/apb.c                  | 2 ++

 hw/pci-host/ppce500.c              | 1 +

 hw/pci-host/prep.c                 | 1 +

 hw/pci-host/q35.c                  | 2 ++

 hw/scsi/esp-pci.c                  | 2 ++

 hw/scsi/esp.c                      | 1 +

 hw/scsi/lsi53c895a.c               | 1 +

 hw/scsi/megasas.c                  | 1 +

 hw/scsi/scsi-bus.c                 | 1 +

 hw/scsi/vhost-scsi.c               | 1 +

 hw/scsi/virtio-scsi.c              | 3 +++

 hw/scsi/vmw_pvscsi.c               | 1 +

 hw/usb/ccid-card-emulated.c        | 1 +

 hw/usb/ccid-card-passthru.c        | 1 +

 hw/usb/dev-audio.c                 | 1 +

 hw/usb/dev-bluetooth.c             | 1 +

 hw/usb/dev-hid.c                   | 3 +++

 hw/usb/dev-hub.c                   | 1 +

 hw/usb/dev-network.c               | 1 +

 hw/usb/dev-serial.c                | 2 ++

 hw/usb/dev-smartcard-reader.c      | 1 +

 hw/usb/dev-storage.c               | 1 +

 hw/usb/dev-uas.c                   | 1 +

 hw/usb/dev-wacom.c                 | 1 +

 hw/usb/hcd-ehci-pci.c              | 2 ++

 hw/usb/hcd-ehci-sysbus.c           | 5 +++++

 hw/usb/hcd-ohci.c                  | 2 ++

 hw/usb/hcd-uhci.c                  | 1 +

 hw/usb/hcd-xhci.c                  | 1 +

 hw/usb/host-libusb.c               | 1 +

 hw/usb/redirect.c                  | 1 +

 hw/virtio/virtio-balloon.c         | 1 +

 hw/virtio/virtio-pci.c             | 8 ++++++++

 hw/virtio/virtio-rng.c             | 1 +

 hw/watchdog/wdt_i6300esb.c         | 1 +

 hw/watchdog/wdt_ib700.c            | 1 +

 hw/xen/xen_platform.c              | 1 +

 hw/xen/xen_pt.c                    | 1 +

 105 files changed, 152 insertions(+)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/9pfs/virtio-9p-device.c         |    1 +

 hw/audio/ac97.c                    |    1 +

 hw/audio/adlib.c                   |    1 +

 hw/audio/cs4231a.c                 |    1 +

 hw/audio/es1370.c                  |    1 +

 hw/audio/gus.c                     |    1 +

 hw/audio/hda-codec.c               |    3 +++

 hw/audio/intel-hda.c               |    3 +++

 hw/audio/pcspk.c                   |    1 +

 hw/audio/pl041.c                   |    1 +

 hw/audio/sb16.c                    |    1 +

 hw/block/fdc.c                     |    3 +++

 hw/block/pc_sysfw.c                |    1 +

 hw/block/pflash_cfi01.c            |    1 +

 hw/block/virtio-blk.c              |    1 +

 hw/char/debugcon.c                 |    1 +

 hw/char/imx_serial.c               |    1 +

 hw/char/ipack.c                    |    1 +

 hw/char/ipoctal232.c               |    1 +

 hw/char/parallel.c                 |    1 +

 hw/char/serial-isa.c               |    1 +

 hw/char/serial-pci.c               |    3 +++

 hw/char/tpci200.c                  |    1 +

 hw/char/virtio-serial-bus.c        |    2 ++

 hw/cpu/icc_bus.c                   |    8 ++++++++

 hw/display/cirrus_vga.c            |    2 ++

 hw/display/g364fb.c                |    1 +

 hw/display/pl110.c                 |    3 +++

 hw/display/qxl.c                   |    2 ++

 hw/display/vga-isa.c               |    1 +

 hw/display/vga-pci.c               |    1 +

 hw/display/vmware_vga.c            |    1 +

 hw/i2c/bitbang_i2c.c               |    1 +

 hw/i2c/core.c                      |    1 +

 hw/i386/kvm/pci-assign.c           |    1 +

 hw/ide/ahci.c                      |    1 +

 hw/ide/ich.c                       |    1 +

 hw/ide/isa.c                       |    1 +

 hw/ide/piix.c                      |    3 +++

 hw/ide/qdev.c                      |    1 +

 hw/ide/via.c                       |    1 +

 hw/isa/i82378.c                    |    1 +

 hw/isa/lpc_ich9.c                  |    1 +

 hw/isa/vt82c686.c                  |    3 +++

 hw/misc/applesmc.c                 |    1 +

 hw/misc/debugexit.c                |    1 +

 hw/misc/ivshmem.c                  |    1 +

 hw/misc/pc-testdev.c               |    2 ++

 hw/misc/pci-testdev.c              |    1 +

 hw/misc/sga.c                      |    1 +

 hw/misc/vfio.c                     |    1 +

 hw/net/e1000.c                     |    1 +

 hw/net/eepro100.c                  |    1 +

 hw/net/lance.c                     |    1 +

 hw/net/mipsnet.c                   |    1 +

 hw/net/ne2000-isa.c                |    1 +

 hw/net/ne2000.c                    |    1 +

 hw/net/opencores_eth.c             |    1 +

 hw/net/pcnet-pci.c                 |    1 +

 hw/net/rtl8139.c                   |    1 +

 hw/net/virtio-net.c                |    1 +

 hw/net/vmxnet3.c                   |    1 +

 hw/pci-bridge/i82801b11.c          |    2 ++

 hw/pci-bridge/ioh3420.c            |    1 +

 hw/pci-bridge/pci_bridge_dev.c     |    1 +

 hw/pci-bridge/xio3130_downstream.c |    1 +

 hw/pci-bridge/xio3130_upstream.c   |    1 +

 hw/pci-host/apb.c                  |    2 ++

 hw/pci-host/ppce500.c              |    1 +

 hw/pci-host/prep.c                 |    1 +

 hw/pci-host/q35.c                  |    2 ++

 hw/scsi/esp-pci.c                  |    2 ++

 hw/scsi/esp.c                      |    1 +

 hw/scsi/lsi53c895a.c               |    1 +

 hw/scsi/megasas.c                  |    1 +

 hw/scsi/scsi-bus.c                 |    1 +

 hw/scsi/vhost-scsi.c               |    1 +

 hw/scsi/virtio-scsi.c              |    3 +++

 hw/scsi/vmw_pvscsi.c               |    1 +

 hw/usb/ccid-card-emulated.c        |    1 +

 hw/usb/ccid-card-passthru.c        |    1 +

 hw/usb/dev-audio.c                 |    1 +

 hw/usb/dev-bluetooth.c             |    1 +

 hw/usb/dev-hid.c                   |    3 +++

 hw/usb/dev-hub.c                   |    1 +

 hw/usb/dev-network.c               |    1 +

 hw/usb/dev-serial.c                |    2 ++

 hw/usb/dev-smartcard-reader.c      |    1 +

 hw/usb/dev-storage.c               |    1 +

 hw/usb/dev-uas.c                   |    1 +

 hw/usb/dev-wacom.c                 |    1 +

 hw/usb/hcd-ehci-pci.c              |    2 ++

 hw/usb/hcd-ehci-sysbus.c           |    5 +++++

 hw/usb/hcd-ohci.c                  |    2 ++

 hw/usb/hcd-uhci.c                  |    1 +

 hw/usb/hcd-xhci.c                  |    1 +

 hw/usb/host-libusb.c               |    1 +

 hw/usb/redirect.c                  |    1 +

 hw/virtio/virtio-balloon.c         |    1 +

 hw/virtio/virtio-pci.c             |    8 ++++++++

 hw/virtio/virtio-rng.c             |    1 +

 hw/watchdog/wdt_i6300esb.c         |    1 +

 hw/watchdog/wdt_ib700.c            |    1 +

 hw/xen/xen_platform.c              |    1 +

 hw/xen/xen_pt.c                    |    1 +

 105 files changed, 152 insertions(+), 0 deletions(-)

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c

index dc6f4e4..69d781d 100644

--- a/hw/9pfs/virtio-9p-device.c

+++ b/hw/9pfs/virtio-9p-device.c

@@ -141,6 +141,7 @@ static void virtio_9p_class_init(ObjectClass *klass, void *data)

     DeviceClass *dc = DEVICE_CLASS(klass);

     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

     dc->props = virtio_9p_properties;

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

     vdc->init = virtio_9p_device_init;

     vdc->get_features = virtio_9p_get_features;

     vdc->get_config = virtio_9p_get_config;

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c

index baf138b..8455a96 100644

--- a/hw/audio/ac97.c

+++ b/hw/audio/ac97.c

@@ -1418,6 +1418,7 @@ static void ac97_class_init (ObjectClass *klass, void *data)

     k->device_id = PCI_DEVICE_ID_INTEL_82801AA_5;

     k->revision = 0x01;

     k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "Intel 82801AA AC97 Audio";

     dc->vmsd = &vmstate_ac97;

     dc->props = ac97_properties;

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c

index fc20857..46934c7 100644

--- a/hw/audio/adlib.c

+++ b/hw/audio/adlib.c

@@ -361,6 +361,7 @@ static void adlib_class_initfn (ObjectClass *klass, void *data)

     DeviceClass *dc = DEVICE_CLASS (klass);

     ISADeviceClass *ic = ISA_DEVICE_CLASS (klass);

     ic->init = Adlib_initfn;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = ADLIB_DESC;

     dc->props = adlib_properties;

 }

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c

index cc605e5..c970722 100644

--- a/hw/audio/cs4231a.c

+++ b/hw/audio/cs4231a.c

@@ -677,6 +677,7 @@ static void cs4231a_class_initfn (ObjectClass *klass, void *data)

     DeviceClass *dc = DEVICE_CLASS (klass);

     ISADeviceClass *ic = ISA_DEVICE_CLASS (klass);

     ic->init = cs4231a_initfn;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "Crystal Semiconductor CS4231A";

     dc->vmsd = &vmstate_cs4231a;

     dc->props = cs4231a_properties;

diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c

index c1cd169..8678e1e 100644

--- a/hw/audio/es1370.c

+++ b/hw/audio/es1370.c

@@ -1069,6 +1069,7 @@ static void es1370_class_init (ObjectClass *klass, void *data)

     k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO;

     k->subsystem_vendor_id = 0x4942;

     k->subsystem_id = 0x4c4c;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "ENSONIQ AudioPCI ES1370";

     dc->vmsd = &vmstate_es1370;

 }

diff --git a/hw/audio/gus.c b/hw/audio/gus.c

index a91921c..3cafca5 100644

--- a/hw/audio/gus.c

+++ b/hw/audio/gus.c

@@ -312,6 +312,7 @@ static void gus_class_initfn (ObjectClass *klass, void *data)

     DeviceClass *dc = DEVICE_CLASS (klass);

     ISADeviceClass *ic = ISA_DEVICE_CLASS (klass);

     ic->init = gus_initfn;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "Gravis Ultrasound GF1";

     dc->vmsd = &vmstate_gus;

     dc->props = gus_properties;

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c

index 94c472c..07a43bf 100644

--- a/hw/audio/hda-codec.c

+++ b/hw/audio/hda-codec.c

@@ -638,6 +638,7 @@ static void hda_audio_output_class_init(ObjectClass *klass, void *data)

     k->exit = hda_audio_exit;

     k->command = hda_audio_command;

     k->stream = hda_audio_stream;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "HDA Audio Codec, output-only (line-out)";

     dc->vmsd = &vmstate_hda_audio;

     dc->props = hda_audio_properties;

@@ -659,6 +660,7 @@ static void hda_audio_duplex_class_init(ObjectClass *klass, void *data)

     k->exit = hda_audio_exit;

     k->command = hda_audio_command;

     k->stream = hda_audio_stream;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "HDA Audio Codec, duplex (line-out, line-in)";

     dc->vmsd = &vmstate_hda_audio;

     dc->props = hda_audio_properties;

@@ -680,6 +682,7 @@ static void hda_audio_micro_class_init(ObjectClass *klass, void *data)

     k->exit = hda_audio_exit;

     k->command = hda_audio_command;

     k->stream = hda_audio_stream;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "HDA Audio Codec, duplex (speaker, microphone)";

     dc->vmsd = &vmstate_hda_audio;

     dc->props = hda_audio_properties;

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c

index 1016af0..e747342 100644

--- a/hw/audio/intel-hda.c

+++ b/hw/audio/intel-hda.c

@@ -1254,6 +1254,7 @@ static void intel_hda_class_init_ich6(ObjectClass *klass, void *data)

     intel_hda_class_init_common(klass);

     k->device_id = 0x2668;

     k->revision = 1;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "Intel HD Audio Controller (ich6)";

 }

@@ -1265,6 +1266,7 @@ static void intel_hda_class_init_ich9(ObjectClass *klass, void *data)

     intel_hda_class_init_common(klass);

     k->device_id = 0x293e;

     k->revision = 3;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "Intel HD Audio Controller (ich9)";

 }

@@ -1287,6 +1289,7 @@ static void hda_codec_device_class_init(ObjectClass *klass, void *data)

     DeviceClass *k = DEVICE_CLASS(klass);

     k->init = hda_codec_dev_init;

     k->exit = hda_codec_dev_exit;

+    set_bit(DEVICE_CATEGORY_SOUND, k->categories);

     k->bus_type = TYPE_HDA_BUS;

     k->props = hda_props;

 }

diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c

index 3a7285f..4e03bc9 100644

--- a/hw/audio/pcspk.c

+++ b/hw/audio/pcspk.c

@@ -187,6 +187,7 @@ static void pcspk_class_initfn(ObjectClass *klass, void *data)

     ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);

     ic->init = pcspk_initfn;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->no_user = 1;

     dc->props = pcspk_properties;

 }

diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c

index 653ab4f..9b11cc9 100644

--- a/hw/audio/pl041.c

+++ b/hw/audio/pl041.c

@@ -626,6 +626,7 @@ static void pl041_device_class_init(ObjectClass *klass, void *data)

     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

     k->init = pl041_init;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->no_user = 1;

     dc->reset = pl041_device_reset;

     dc->vmsd = &vmstate_pl041;

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c

index 6ddc0ac..277bde1 100644

--- a/hw/audio/sb16.c

+++ b/hw/audio/sb16.c

@@ -1406,6 +1406,7 @@ static void sb16_class_initfn (ObjectClass *klass, void *data)

     DeviceClass *dc = DEVICE_CLASS (klass);

     ISADeviceClass *ic = ISA_DEVICE_CLASS (klass);

     ic->init = sb16_initfn;

+    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

     dc->desc = "Creative Sound Blaster 16";

     dc->vmsd = &vmstate_sb16;

     dc->props = sb16_properties;

diff --git a/hw/block/fdc.c b/hw/block/fdc.c

index 0888652..e292f4c 100644

--- a/hw/block/fdc.c

+++ b/hw/block/fdc.c

@@ -2210,6 +2210,7 @@ static void isabus_fdc_class_init(ObjectClass *klass, void *data)

     dc->reset = fdctrl_external_reset_isa;

     dc->vmsd = &vmstate_isa_fdc;

     dc->props = isa_fdc_properties;

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

 static const TypeInfo isa_fdc_info = {

@@ -2244,6 +2245,7 @@ static void sysbus_fdc_class_init(ObjectClass *klass, void *data)

     dc->reset = fdctrl_external_reset_sysbus;

     dc->vmsd = &vmstate_sysbus_fdc;

     dc->props = sysbus_fdc_properties;

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

 static const TypeInfo sysbus_fdc_info = {

@@ -2267,6 +2269,7 @@ static void sun4m_fdc_class_init(ObjectClass *klass, void *data)

     dc->reset = fdctrl_external_reset_sysbus;

     dc->vmsd = &vmstate_sysbus_fdc;

     dc->props = sun4m_fdc_properties;

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

 static const TypeInfo sun4m_fdc_info = {

diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c

index 4e3e6b6..0bc5b7a 100644

--- a/hw/block/pc_sysfw.c

+++ b/hw/block/pc_sysfw.c

@@ -268,6 +268,7 @@ static void pcsysfw_class_init (ObjectClass *klass, void *data)

 {

     DeviceClass *dc = DEVICE_CLASS (klass);

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

     dc->desc = "PC System Firmware";

     dc->init = pcsysfw_init;

     dc->props = pcsysfw_properties;

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c

index 3ff20e0..0bbb1a3 100644

--- a/hw/block/pflash_cfi01.c

+++ b/hw/block/pflash_cfi01.c

@@ -715,6 +715,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)

     k->init = pflash_cfi01_init;

     dc->props = pflash_cfi01_properties;

     dc->vmsd = &vmstate_pflash;

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

 }

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c

index ce1a523..9fe622d 100644

--- a/hw/block/virtio-blk.c

+++ b/hw/block/virtio-blk.c

@@ -756,6 +756,7 @@ static void virtio_blk_class_init(ObjectClass *klass, void *data)

     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

     dc->exit = virtio_blk_device_exit;

     dc->props = virtio_blk_properties;

+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

     vdc->init = virtio_blk_device_init;

     vdc->get_config = virtio_blk_update_config;

     vdc->set_config = virtio_blk_set_config;

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c

index 02c9577..b974889 100644

--- a/hw/char/debugcon.c

+++ b/hw/char/debugcon.c

@@ -117,6 +117,7 @@ static void debugcon_isa_class_initfn(ObjectClass *klass, void *data)

     ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);

     ic->init = debugcon_isa_initfn;

     dc->props = debugcon_isa_properties;

+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

 }

 static const TypeInfo debugcon_isa_info = {

diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c

index 2a2c230..a11b9c2 100644

--- a/hw/char/imx_serial.c

+++ b/hw/char/imx_serial.c

@@ -448,6 +448,7 @@ static void imx_serial_class_init(ObjectClass *klass, void *data)

     k->init = imx_serial_init;

     dc->vmsd = &vmstate_imx_serial;

     dc->reset = imx_serial_reset_at_boot;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

     dc->desc = "i.MX series UART";

     dc->props = imx32_serial_properties;

 }

diff --git a/hw/char/ipack.c b/hw/char/ipack.c

index e15540d..f890471 100644

--- a/hw/char/ipack.c

+++ b/hw/char/ipack.c

@@ -74,6 +74,7 @@ static Property ipack_device_props[] = {

 static void ipack_device_class_init(ObjectClass *klass, void *data)

 {

     DeviceClass *k = DEVICE_CLASS(klass);

+    set_bit(DEVICE_CATEGORY_INPUT, k->categories);

     k->bus_type = TYPE_IPACK_BUS;

     k->init = ipack_device_dev_init;

     k->exit = ipack_device_dev_exit;

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c

index c9698a6..88e2cca 100644

--- a/hw/char/ipoctal232.c

+++ b/hw/char/ipoctal232.c

@@ -585,6 +585,7 @@ static void ipoctal_class_init(ObjectClass *klass, void *data)

     ic->mem_read8   = mem_read8;

     ic->mem_write8  = mem_write8;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

     dc->desc    = "GE IP-Octal 232 8-channel RS-232 IndustryPack";

     dc->props   = ipoctal_properties;

     dc->vmsd    = &vmstate_ipoctal;

diff --git a/hw/char/parallel.c b/hw/char/parallel.c

index 8e48284..046e453 100644

--- a/hw/char/parallel.c

+++ b/hw/char/parallel.c

@@ -602,6 +602,7 @@ static void parallel_isa_class_initfn(ObjectClass *klass, void *data)

     ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);

     ic->init = parallel_isa_initfn;

     dc->props = parallel_isa_properties;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

 }

 static const TypeInfo parallel_isa_info = {

diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c

index 342b4cc..cc00544 100644

--- a/hw/char/serial-isa.c

+++ b/hw/char/serial-isa.c

@@ -100,6 +100,7 @@ static void serial_isa_class_initfn(ObjectClass *klass, void *data)

     ic->init = serial_isa_initfn;

     dc->vmsd = &vmstate_isa_serial;

     dc->props = serial_isa_properties;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

 }

 static const TypeInfo serial_isa_info = {

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c

index 2138e35..77fec01 100644

--- a/hw/char/serial-pci.c

+++ b/hw/char/serial-pci.c

@@ -191,6 +191,7 @@ static void serial_pci_class_initfn(ObjectClass *klass, void *data)

     pc->class_id = PCI_CLASS_COMMUNICATION_SERIAL;

     dc->vmsd = &vmstate_pci_serial;

     dc->props = serial_pci_properties;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

 }

 static void multi_2x_serial_pci_class_initfn(ObjectClass *klass, void *data)

@@ -205,6 +206,7 @@ static void multi_2x_serial_pci_class_initfn(ObjectClass *klass, void *data)

     pc->class_id = PCI_CLASS_COMMUNICATION_SERIAL;

     dc->vmsd = &vmstate_pci_multi_serial;

     dc->props = multi_2x_serial_pci_properties;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

 }

 static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)

@@ -219,6 +221,7 @@ static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)

     pc->class_id = PCI_CLASS_COMMUNICATION_SERIAL;

     dc->vmsd = &vmstate_pci_multi_serial;

     dc->props = multi_4x_serial_pci_properties;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

 }

 static const TypeInfo serial_pci_info = {

diff --git a/hw/char/tpci200.c b/hw/char/tpci200.c

index 0170602..cc6a963 100644

--- a/hw/char/tpci200.c

+++ b/hw/char/tpci200.c

@@ -652,6 +652,7 @@ static void tpci200_class_init(ObjectClass *klass, void *data)

     k->class_id = PCI_CLASS_BRIDGE_OTHER;

     k->subsystem_vendor_id = PCI_VENDOR_ID_TEWS;

     k->subsystem_id = 0x300A;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

     dc->desc = "TEWS TPCI200 IndustryPack carrier";

     dc->vmsd = &vmstate_tpci200;

 }

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c

index cc3d1dd..da417c7 100644

--- a/hw/char/virtio-serial-bus.c

+++ b/hw/char/virtio-serial-bus.c

@@ -971,6 +971,7 @@ static void virtio_serial_port_class_init(ObjectClass *klass, void *data)

 {

     DeviceClass *k = DEVICE_CLASS(klass);

     k->init = virtser_port_qdev_init;

+    set_bit(DEVICE_CATEGORY_INPUT, k->categories);

     k->bus_type = TYPE_VIRTIO_SERIAL_BUS;

     k->exit = virtser_port_qdev_exit;

     k->unplug = qdev_simple_unplug_cb;

@@ -1017,6 +1018,7 @@ static void virtio_serial_class_init(ObjectClass *klass, void *data)

     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

     dc->exit = virtio_serial_device_exit;

     dc->props = virtio_serial_properties;

+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

     vdc->init = virtio_serial_device_init;

     vdc->get_features = get_features;

     vdc->get_config = get_config;

diff --git a/hw/cpu/icc_bus.c b/hw/cpu/icc_bus.c

index 73a1dc9..4df814b 100644

--- a/hw/cpu/icc_bus.c

+++ b/hw/cpu/icc_bus.c

@@ -101,11 +101,19 @@ static void icc_bridge_init(Object *obj)

     s->icc_bus.apic_address_space = &s->apic_container;

 }

+static void icc_bridge_class_init(ObjectClass *oc, void *data)

+{

+    DeviceClass *dc = DEVICE_CLASS(oc);

+

+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

+}

+

 static const TypeInfo icc_bridge_info = {

     .name  = TYPE_ICC_BRIDGE,

     .parent = TYPE_SYS_BUS_DEVICE,

     .instance_init  = icc_bridge_init,

     .instance_size  = sizeof(ICCBridgeState),

+    .class_init = icc_bridge_class_init,

 };

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c

index fa8eae2..a7634ba 100644

--- a/hw/display/cirrus_vga.c

+++ b/hw/display/cirrus_vga.c

@@ -2936,6 +2936,7 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)

     dc->vmsd  = &vmstate_cirrus_vga;

     k->init   = vga_initfn;

     dc->props = isa_cirrus_vga_properties;

+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

 }

 static const TypeInfo isa_cirrus_vga_info = {

@@ -3001,6 +3002,7 @@ static void cirrus_vga_class_init(ObjectClass *klass, void *data)

     k->vendor_id = PCI_VENDOR_ID_CIRRUS;

     k->device_id = CIRRUS_ID_CLGD5446;

     k->class_id = PCI_CLASS_DISPLAY_VGA;

+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

     dc->desc = "Cirrus CLGD 54xx VGA";

     dc->vmsd = &vmstate_pci_cirrus_vga;

     dc->props = pci_vga_cirrus_properties;

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c

index 2a4047e..2b974ca 100644

--- a/hw/display/g364fb.c

+++ b/hw/display/g364fb.c

@@ -528,6 +528,7 @@ static void g364fb_sysbus_class_init(ObjectClass *klass, void *data)

     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

     k->init = g364fb_sysbus_init;

+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

     dc->desc = "G364 framebuffer";

     dc->reset = g364fb_sysbus_reset;

     dc->vmsd = &vmstate_g364fb;

diff --git a/hw/display/pl110.c b/hw/display/pl110.c

index f259955..b45a7be 100644

--- a/hw/display/pl110.c

+++ b/hw/display/pl110.c

@@ -481,6 +481,7 @@ static void pl110_class_init(ObjectClass *klass, void *data)

     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

     k->init = pl110_init;

+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

     dc->no_user = 1;

     dc->vmsd = &vmstate_pl110;

 }

@@ -498,6 +499,7 @@ static void pl110_versatile_class_init(ObjectClass *klass, void *data)

     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

     k->init = pl110_versatile_init;

+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

     dc->no_user = 1;

     dc->vmsd = &vmstate_pl110;

 }

@@ -515,6 +517,7 @@ static void pl111_class_init(ObjectClass *klass, void *data)

     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

     k->init = pl111_init;

+    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

     dc->no_user = 1;

     dc->vmsd = &vmstate_pl110;

 }

diff --git a/hw/display/qxl.c b/hw/display/qxl.c