aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/block/fdc.c10
-rw-r--r--hw/block/pflash_cfi01.c5
-rw-r--r--hw/core/sysbus.c11
-rw-r--r--hw/i386/amd_iommu.c5
-rw-r--r--hw/i386/intel_iommu.c5
-rw-r--r--hw/i386/kvm/clock.c5
-rw-r--r--hw/i386/kvm/ioapic.c5
-rw-r--r--hw/i386/kvmvapic.c5
-rw-r--r--hw/ide/ahci.c10
-rw-r--r--hw/intc/ioapic.c5
-rw-r--r--hw/isa/isa-bus.c5
-rw-r--r--hw/misc/unimp.c5
-rw-r--r--hw/net/fsl_etsec/etsec.c2
-rw-r--r--hw/nvram/fw_cfg.c10
-rw-r--r--hw/ppc/spapr_pci.c2
-rw-r--r--hw/scsi/esp.c5
-rw-r--r--hw/sd/sdhci.c5
-rw-r--r--hw/timer/hpet.c5
-rw-r--r--hw/usb/hcd-ohci.c5
-rw-r--r--hw/vfio/amd-xgbe.c2
-rw-r--r--hw/vfio/calxeda-xgmac.c2
-rw-r--r--hw/virtio/virtio-mmio.c5
-rw-r--r--hw/xen/xen_backend.c10
23 files changed, 129 insertions, 0 deletions
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 2e629b3..5c28a0b 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -2880,6 +2880,11 @@ static void sysbus_fdc_class_init(ObjectClass *klass, void *data)
dc->props = sysbus_fdc_properties;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo sysbus_fdc_info = {
@@ -2906,6 +2911,11 @@ static void sun4m_fdc_class_init(ObjectClass *klass, void *data)
dc->props = sun4m_fdc_properties;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo sun4m_fdc_info = {
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 594d4cf..ef71956 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -927,6 +927,11 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
dc->props = pflash_cfi01_properties;
dc->vmsd = &vmstate_pflash;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index c0f560b..5d0887f 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -326,6 +326,17 @@ static void sysbus_device_class_init(ObjectClass *klass, void *data)
DeviceClass *k = DEVICE_CLASS(klass);
k->init = sysbus_device_init;
k->bus_type = TYPE_SYSTEM_BUS;
+ /*
+ * device_add plugs devices into a suitable bus. For "real" buses,
+ * that actually connects the device. For sysbus, the connections
+ * need to be made separately, and device_add can't do that. The
+ * device would be left unconnected, and will probably not work
+ *
+ * However, a few machines can handle device_add/-device with
+ * a few specific sysbus devices. In those cases, the device
+ * subclass needs to override it and set user_creatable=true.
+ */
+ k->user_creatable = false;
}
static const TypeInfo sysbus_device_type_info = {
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index f86a40a..7b92c8c 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1186,6 +1186,11 @@ static void amdvi_class_init(ObjectClass *klass, void* data)
dc->vmsd = &vmstate_amdvi;
dc->hotpluggable = false;
dc_class->realize = amdvi_realize;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo amdvi = {
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 02f047c..54187a0 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -3009,6 +3009,11 @@ static void vtd_class_init(ObjectClass *klass, void *data)
dc->hotpluggable = false;
x86_class->realize = vtd_realize;
x86_class->int_remap = vtd_int_remap;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo vtd_info = {
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 13eca37..7665bef 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -286,6 +286,11 @@ static void kvmclock_class_init(ObjectClass *klass, void *data)
dc->realize = kvmclock_realize;
dc->vmsd = &kvmclock_vmsd;
dc->props = kvmclock_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo kvmclock_info = {
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index 98ca480..348c405 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -167,6 +167,11 @@ static void kvm_ioapic_class_init(ObjectClass *klass, void *data)
k->post_load = kvm_ioapic_put;
dc->reset = kvm_ioapic_reset;
dc->props = kvm_ioapic_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo kvm_ioapic_info = {
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 82a4955..45f6267 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -856,6 +856,11 @@ static void vapic_class_init(ObjectClass *klass, void *data)
dc->reset = vapic_reset;
dc->vmsd = &vmstate_vapic;
dc->realize = vapic_realize;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo vapic_type = {
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index f60826d..7f10cda 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1721,6 +1721,11 @@ static void sysbus_ahci_class_init(ObjectClass *klass, void *data)
dc->props = sysbus_ahci_properties;
dc->reset = sysbus_ahci_reset;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo sysbus_ahci_info = {
@@ -1815,6 +1820,11 @@ static void allwinner_ahci_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
dc->vmsd = &vmstate_allwinner_ahci;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo allwinner_ahci_info = {
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 37c4386..f9e4f77 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -448,6 +448,11 @@ static void ioapic_class_init(ObjectClass *klass, void *data)
k->post_load = ioapic_update_kvm_routes;
dc->reset = ioapic_reset_common;
dc->props = ioapic_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo ioapic_info = {
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 348e0ea..ad4ac3b 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -221,6 +221,11 @@ static void isabus_bridge_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->fw_name = "isa";
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo isabus_bridge_info = {
diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c
index bcbb585..e446c1d 100644
--- a/hw/misc/unimp.c
+++ b/hw/misc/unimp.c
@@ -90,6 +90,11 @@ static void unimp_class_init(ObjectClass *klass, void *data)
dc->realize = unimp_realize;
dc->props = unimp_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo unimp_info = {
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index aa2b0d5..9da1932 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -416,6 +416,8 @@ static void etsec_class_init(ObjectClass *klass, void *data)
dc->realize = etsec_realize;
dc->reset = etsec_reset;
dc->props = etsec_properties;
+ /* Supported by ppce500 machine */
+ dc->user_creatable = true;
}
static TypeInfo etsec_info = {
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 316fca9..7993aea 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -1101,6 +1101,11 @@ static void fw_cfg_io_class_init(ObjectClass *klass, void *data)
dc->realize = fw_cfg_io_realize;
dc->props = fw_cfg_io_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo fw_cfg_io_info = {
@@ -1167,6 +1172,11 @@ static void fw_cfg_mem_class_init(ObjectClass *klass, void *data)
dc->realize = fw_cfg_mem_realize;
dc->props = fw_cfg_mem_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo fw_cfg_mem_info = {
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index e7567e2..a7cff32 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1994,6 +1994,8 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data)
dc->props = spapr_phb_properties;
dc->reset = spapr_phb_reset;
dc->vmsd = &vmstate_spapr_pci;
+ /* Supported by TYPE_SPAPR_MACHINE */
+ dc->user_creatable = true;
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
hp->plug = spapr_phb_hot_plug_child;
hp->unplug = spapr_phb_hot_unplug_child;
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index eee831e..7bdc1e1 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -728,6 +728,11 @@ static void sysbus_esp_class_init(ObjectClass *klass, void *data)
dc->reset = sysbus_esp_hard_reset;
dc->vmsd = &vmstate_sysbus_esp_scsi;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo sysbus_esp_info = {
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 6d6a791..dbf61fc 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1360,6 +1360,11 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data)
dc->props = sdhci_sysbus_properties;
dc->realize = sdhci_sysbus_realize;
dc->reset = sdhci_poweron_reset;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo sdhci_sysbus_info = {
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index a2c18b3..4dcbd5b 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -771,6 +771,11 @@ static void hpet_device_class_init(ObjectClass *klass, void *data)
dc->reset = hpet_reset;
dc->vmsd = &vmstate_hpet;
dc->props = hpet_device_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo hpet_device_info = {
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 3ada35e..18b3102 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -2159,6 +2159,11 @@ static void ohci_sysbus_class_init(ObjectClass *klass, void *data)
dc->desc = "OHCI USB Controller";
dc->props = ohci_sysbus_properties;
dc->reset = usb_ohci_reset_sysbus;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo ohci_sysbus_info = {
diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c
index 2c60310..fab196c 100644
--- a/hw/vfio/amd-xgbe.c
+++ b/hw/vfio/amd-xgbe.c
@@ -38,6 +38,8 @@ static void vfio_amd_xgbe_class_init(ObjectClass *klass, void *data)
dc->realize = amd_xgbe_realize;
dc->desc = "VFIO AMD XGBE";
dc->vmsd = &vfio_platform_amd_xgbe_vmstate;
+ /* Supported by TYPE_VIRT_MACHINE */
+ dc->user_creatable = true;
}
static const TypeInfo vfio_amd_xgbe_dev_info = {
diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c
index bb15d58..7bb17af 100644
--- a/hw/vfio/calxeda-xgmac.c
+++ b/hw/vfio/calxeda-xgmac.c
@@ -38,6 +38,8 @@ static void vfio_calxeda_xgmac_class_init(ObjectClass *klass, void *data)
dc->realize = calxeda_xgmac_realize;
dc->desc = "VFIO Calxeda XGMAC";
dc->vmsd = &vfio_platform_calxeda_xgmac_vmstate;
+ /* Supported by TYPE_VIRT_MACHINE */
+ dc->user_creatable = true;
}
static const TypeInfo vfio_calxeda_xgmac_dev_info = {
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 5807aa8..6491a77 100644
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -450,6 +450,11 @@ static void virtio_mmio_class_init(ObjectClass *klass, void *data)
dc->reset = virtio_mmio_reset;
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
dc->props = virtio_mmio_properties;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo virtio_mmio_info = {
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index 2cac47d..2df102a 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -619,6 +619,11 @@ static void xendev_class_init(ObjectClass *klass, void *data)
dc->props = xendev_properties;
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo xendev_type_info = {
@@ -662,6 +667,11 @@ static void xen_sysdev_class_init(ObjectClass *klass, void *data)
k->init = xen_sysdev_init;
dc->props = xen_sysdev_properties;
dc->bus_type = TYPE_XENSYSBUS;
+ /*
+ * FIXME: Set only because we are not sure yet if this device
+ * will be outside the q35 sysbus whitelist.
+ */
+ dc->user_creatable = true;
}
static const TypeInfo xensysdev_info = {