@@ -2829,12 +2829,12 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
* configuration of the particular instance.
*/
mc->max_cpus = 512;
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM);
+ machine_class_allow_dynamic_device(mc, TYPE_VFIO_CALXEDA_XGMAC);
+ machine_class_allow_dynamic_device(mc, TYPE_VFIO_AMD_XGBE);
+ machine_class_allow_dynamic_device(mc, TYPE_RAMFB_DEVICE);
+ machine_class_allow_dynamic_device(mc, TYPE_VFIO_PLATFORM);
#ifdef CONFIG_TPM
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
+ machine_class_allow_dynamic_device(mc, TYPE_TPM_TIS_SYSBUS);
#endif
mc->block_default_type = IF_VIRTIO;
mc->no_cdrom = 1;
@@ -756,7 +756,7 @@ static void microvm_class_init(ObjectClass *oc, void *data)
MICROVM_MACHINE_AUTO_KERNEL_CMDLINE,
"Set off to disable adding virtio-mmio devices to the kernel cmdline");
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
+ machine_class_allow_dynamic_device(mc, TYPE_RAMFB_DEVICE);
}
static const TypeInfo microvm_machine_info = {
@@ -411,8 +411,8 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->desc = "Standard PC (i440FX + PIIX, 1996)";
m->default_machine_opts = "firmware=bios-256k.bin";
m->default_display = "std";
- machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
- machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
+ machine_class_allow_dynamic_device(m, TYPE_RAMFB_DEVICE);
+ machine_class_allow_dynamic_device(m, TYPE_VMBUS_BRIDGE);
}
static void pc_i440fx_7_0_machine_options(MachineClass *m)
@@ -353,10 +353,10 @@ static void pc_q35_machine_options(MachineClass *m)
m->default_display = "std";
m->default_kernel_irqchip_split = false;
m->no_floppy = 1;
- machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
- machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
- machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
- machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
+ machine_class_allow_dynamic_device(m, TYPE_AMD_IOMMU_DEVICE);
+ machine_class_allow_dynamic_device(m, TYPE_INTEL_IOMMU_DEVICE);
+ machine_class_allow_dynamic_device(m, TYPE_RAMFB_DEVICE);
+ machine_class_allow_dynamic_device(m, TYPE_VMBUS_BRIDGE);
m->max_cpus = 288;
}
@@ -102,7 +102,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");
mc->default_ram_id = "mpc8544ds.ram";
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ETSEC_COMMON);
+ machine_class_allow_dynamic_device(mc, TYPE_ETSEC_COMMON);
}
static const TypeInfo e500plat_info = {
@@ -4586,7 +4586,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
mc->default_ram_id = "ppc_spapr.ram";
mc->default_display = "std";
mc->kvm_type = spapr_kvm_type;
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE);
+ machine_class_allow_dynamic_device(mc, TYPE_SPAPR_PCI_HOST_BRIDGE);
mc->pci_allow_0_address = true;
assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = spapr_get_hotplug_handler;
@@ -1513,7 +1513,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
mc->numa_mem_supported = true;
mc->default_ram_id = "riscv_virt_board.ram";
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
+ machine_class_allow_dynamic_device(mc, TYPE_RAMFB_DEVICE);
object_class_property_add_bool(oc, "aclint", virt_get_aclint,
virt_set_aclint);
@@ -722,7 +722,7 @@ static void xen_set_dynamic_sysbus(void)
ObjectClass *oc = object_get_class(machine);
MachineClass *mc = MACHINE_CLASS(oc);
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_XENSYSDEV);
+ machine_class_allow_dynamic_device(mc, TYPE_XENSYSDEV);
}
int xen_be_register(const char *type, struct XenDevOps *ops)
All callsite are updated to the new function name "machine_class_allow_dynamic_device" Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- hw/arm/virt.c | 10 +++++----- hw/i386/microvm.c | 2 +- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 8 ++++---- hw/ppc/e500plat.c | 2 +- hw/ppc/spapr.c | 2 +- hw/riscv/virt.c | 2 +- hw/xen/xen-legacy-backend.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-)