Mark remaining global TypeInfo instances as const
Subsystems (5)
v2 cover Mark remaining global TypeInfo instances as const
Applied review comments:
* Mention the sed-expression used for the cleanup in the commit message
* Have checkpatch.pl error on further non-const TypeInfo introduction
Bernhard Beschow (2):
Mark remaining global TypeInfo instances as const
checkpatch: Ensure that TypeInfos are const
hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/ipmi/ipmi.c | 4 ++-- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_powermgt.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/bcm2835_rng.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod-tcg.c | 2 +- hw/s390x/tod.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/cadence_sdhci.c | 2 +- hw/sd/npcm7xx_sdhci.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- qom/object.c | 4 ++-- scripts/checkpatch.pl | 1 + 40 files changed, 43 insertions(+), 42 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 Mark remaining global TypeInfo instances as const
More than 1k of TypeInfo instances are already marked as const. Mark the remaining ones, too.
This commit was created with:
git grep -z -l 'static TypeInfo' -- '*.c' | \
xargs -0 sed -i 's/static TypeInfo/static const TypeInfo/'
--- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/ipmi/ipmi.c | 4 ++-- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_powermgt.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/bcm2835_rng.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod-tcg.c | 2 +- hw/s390x/tod.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/cadence_sdhci.c | 2 +- hw/sd/npcm7xx_sdhci.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- qom/object.c | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)
hw/core/generic-loader.c +1 -1
@@ -207,7 +207,7 @@ static void generic_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo generic_loader_info = { +static const TypeInfo generic_loader_info = { .name =TYPE_GENERIC_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GenericLoaderState),
hw/core/guest-loader.c +1 -1
@@ -129,7 +129,7 @@ static void guest_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo guest_loader_info = { +static const TypeInfo guest_loader_info = { .name =TYPE_GUEST_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GuestLoaderState),
hw/display/bcm2835_fb.c +1 -1
@@ -454,7 +454,7 @@ static void bcm2835_fb_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_fb; } -static TypeInfo bcm2835_fb_info = { +static const TypeInfo bcm2835_fb_info = { .name =TYPE_BCM2835_FB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835FBState),
hw/display/i2c-ddc.c +1 -1
@@ -113,7 +113,7 @@ static void i2c_ddc_class_init(ObjectClass *oc, void *data) isc->send = i2c_ddc_tx; } -static TypeInfo i2c_ddc_info = { +static const TypeInfo i2c_ddc_info = { .name =TYPE_I2CDDC , .parent =TYPE_I2C_SLAVE , .instance_size =sizeof (I2CDDCState),
hw/display/macfb.c +2 -2
@@ -783,14 +783,14 @@ static void macfb_nubus_class_init(ObjectClass *klass, void *data)device_class_set_props (dc, macfb_nubus_properties); } -static TypeInfo macfb_sysbus_info = { +static const TypeInfo macfb_sysbus_info = { .name =TYPE_MACFB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (MacfbSysBusState), .class_init = macfb_sysbus_class_init, }; -static TypeInfo macfb_nubus_info = { +static const TypeInfo macfb_nubus_info = { .name =TYPE_NUBUS_MACFB , .parent =TYPE_NUBUS_DEVICE , .instance_size =sizeof (MacfbNubusState),
hw/display/virtio-vga.c +1 -1
@@ -220,7 +220,7 @@ static void virtio_vga_base_class_init(ObjectClass *klass, void *data) virtio_vga_set_big_endian_fb); } -static TypeInfo virtio_vga_base_info = { +static const TypeInfo virtio_vga_base_info = { .name =TYPE_VIRTIO_VGA_BASE , .parent =TYPE_VIRTIO_PCI , .instance_size =sizeof (VirtIOVGABase),
hw/dma/bcm2835_dma.c +1 -1
@@ -394,7 +394,7 @@ static void bcm2835_dma_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_dma; } -static TypeInfo bcm2835_dma_info = { +static const TypeInfo bcm2835_dma_info = { .name =TYPE_BCM2835_DMA , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835DMAState),
hw/i386/pc_piix.c +1 -1
@@ -865,7 +865,7 @@ static void isa_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; }; -static TypeInfo isa_bridge_info = { +static const TypeInfo isa_bridge_info = { .name ="igd-passthrough-isa-bridge" , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PCIDevice),
hw/i386/sgx-epc.c +1 -1
@@ -167,7 +167,7 @@ static void sgx_epc_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = sgx_epc_md_fill_device_info; } -static TypeInfo sgx_epc_info = { +static const TypeInfo sgx_epc_info = { .name =TYPE_SGX_EPC , .parent =TYPE_DEVICE , .instance_size =sizeof (SGXEPCDevice),
hw/intc/bcm2835_ic.c +1 -1
@@ -227,7 +227,7 @@ static void bcm2835_ic_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_ic; } -static TypeInfo bcm2835_ic_info = { +static const TypeInfo bcm2835_ic_info = { .name =TYPE_BCM2835_IC , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835ICState),
hw/intc/bcm2836_control.c +1 -1
@@ -392,7 +392,7 @@ static void bcm2836_control_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2836_control; } -static TypeInfo bcm2836_control_info = { +static const TypeInfo bcm2836_control_info = { .name =TYPE_BCM2836_CONTROL , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2836ControlState),
hw/ipmi/ipmi.c +2 -2
@@ -85,7 +85,7 @@ static void ipmi_interface_class_init(ObjectClass *class, void *data) ik->do_hw_op = ipmi_do_hw_op; } -static TypeInfo ipmi_interface_type_info = { +static const TypeInfo ipmi_interface_type_info = { .name =TYPE_IPMI_INTERFACE , .parent =TYPE_INTERFACE , .class_size =sizeof (IPMIInterfaceClass),
@@ -120,7 +120,7 @@ static void bmc_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, ipmi_bmc_properties); } -static TypeInfo ipmi_bmc_type_info = { +static const TypeInfo ipmi_bmc_type_info = { .name =TYPE_IPMI_BMC , .parent =TYPE_DEVICE , .instance_size =sizeof (IPMIBmc),
hw/mem/nvdimm.c +1 -1
@@ -248,7 +248,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo nvdimm_info = { +static const TypeInfo nvdimm_info = { .name =TYPE_NVDIMM , .parent =TYPE_PC_DIMM , .class_size =sizeof (NVDIMMClass),
hw/mem/pc-dimm.c +1 -1
@@ -286,7 +286,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = pc_dimm_md_fill_device_info; } -static TypeInfo pc_dimm_info = { +static const TypeInfo pc_dimm_info = { .name =TYPE_PC_DIMM , .parent =TYPE_DEVICE , .instance_size =sizeof (PCDIMMDevice),
hw/misc/bcm2835_mbox.c +1 -1
@@ -324,7 +324,7 @@ static void bcm2835_mbox_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_mbox; } -static TypeInfo bcm2835_mbox_info = { +static const TypeInfo bcm2835_mbox_info = { .name =TYPE_BCM2835_MBOX , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835MboxState),
hw/misc/bcm2835_powermgt.c +1 -1
@@ -144,7 +144,7 @@ static void bcm2835_powermgt_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_powermgt; } -static TypeInfo bcm2835_powermgt_info = { +static const TypeInfo bcm2835_powermgt_info = { .name =TYPE_BCM2835_POWERMGT , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PowerMgtState),
hw/misc/bcm2835_property.c +1 -1
@@ -421,7 +421,7 @@ static void bcm2835_property_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_property; } -static TypeInfo bcm2835_property_info = { +static const TypeInfo bcm2835_property_info = { .name =TYPE_BCM2835_PROPERTY , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PropertyState),
hw/misc/bcm2835_rng.c +1 -1
@@ -131,7 +131,7 @@ static void bcm2835_rng_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_rng; } -static TypeInfo bcm2835_rng_info = { +static const TypeInfo bcm2835_rng_info = { .name =TYPE_BCM2835_RNG , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835RngState),
hw/misc/pvpanic-isa.c +1 -1
@@ -77,7 +77,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_isa_info = { +static const TypeInfo pvpanic_isa_info = { .name =TYPE_PVPANIC_ISA_DEVICE , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PVPanicISAState),
hw/misc/pvpanic-pci.c +1 -1
@@ -74,7 +74,7 @@ static void pvpanic_pci_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_pci_info = { +static const TypeInfo pvpanic_pci_info = { .name =TYPE_PVPANIC_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PVPanicPCIState),
hw/net/fsl_etsec/etsec.c +1 -1
@@ -430,7 +430,7 @@ static void etsec_class_init(ObjectClass *klass, void *data) dc->user_creatable = true; } -static TypeInfo etsec_info = { +static const TypeInfo etsec_info = { .name =TYPE_ETSEC_COMMON , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (eTSEC),
hw/ppc/prep_systemio.c +1 -1
@@ -300,7 +300,7 @@ static void prep_systemio_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, prep_systemio_properties); } -static TypeInfo prep_systemio800_info = { +static const TypeInfo prep_systemio800_info = { .name =TYPE_PREP_SYSTEMIO , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PrepSystemIoState),
hw/ppc/spapr_iommu.c +1 -1
@@ -685,7 +685,7 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data)spapr_register_hypercall (H_STUFF_TCE , h_stuff_tce); } -static TypeInfo spapr_tce_table_info = { +static const TypeInfo spapr_tce_table_info = { .name =TYPE_SPAPR_TCE_TABLE , .parent =TYPE_DEVICE , .instance_size =sizeof (SpaprTceTable),
hw/s390x/s390-pci-bus.c +1 -1
@@ -1392,7 +1392,7 @@ static const TypeInfo s390_pci_device_info = { .class_init = s390_pci_device_class_init, }; -static TypeInfo s390_pci_iommu_info = { +static const TypeInfo s390_pci_iommu_info = { .name =TYPE_S390_PCI_IOMMU , .parent =TYPE_OBJECT , .instance_size =sizeof (S390PCIIOMMU ),
hw/s390x/sclp.c +1 -1
@@ -460,7 +460,7 @@ static void sclp_class_init(ObjectClass *oc, void *data) sc->service_interrupt = service_interrupt; } -static TypeInfo sclp_info = { +static const TypeInfo sclp_info = { .name =TYPE_SCLP , .parent =TYPE_DEVICE , .instance_init = sclp_init,
hw/s390x/tod-kvm.c +1 -1
@@ -147,7 +147,7 @@ static void kvm_s390_tod_init(Object *obj) td->stopped = false; } -static TypeInfo kvm_s390_tod_info = { +static const TypeInfo kvm_s390_tod_info = { .name =TYPE_KVM_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),
hw/s390x/tod-tcg.c +1 -1
@@ -73,7 +73,7 @@ static void qemu_s390_tod_init(Object *obj) } } -static TypeInfo qemu_s390_tod_info = { +static const TypeInfo qemu_s390_tod_info = { .name =TYPE_QEMU_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),
hw/s390x/tod.c +1 -1
@@ -123,7 +123,7 @@ static void s390_tod_class_init(ObjectClass *oc, void *data) dc->user_creatable = false; } -static TypeInfo s390_tod_info = { +static const TypeInfo s390_tod_info = { .name =TYPE_S390_TOD , .parent =TYPE_DEVICE , .instance_size =sizeof (S390TODState),
hw/scsi/lsi53c895a.c +1 -1
@@ -2352,7 +2352,7 @@ static void lsi53c810_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_LSI_53C810 ; } -static TypeInfo lsi53c810_info = { +static const TypeInfo lsi53c810_info = { .name =TYPE_LSI53C810 , .parent =TYPE_LSI53C895A , .class_init = lsi53c810_class_init,
hw/sd/allwinner-sdhost.c +1 -1
@@ -835,7 +835,7 @@ static void allwinner_sdhost_sun5i_class_init(ObjectClass *klass, void *data) sc->max_desc_size =64 * KiB; } -static TypeInfo allwinner_sdhost_info = { +static const TypeInfo allwinner_sdhost_info = { .name =TYPE_AW_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_init = allwinner_sdhost_init,
hw/sd/aspeed_sdhci.c +1 -1
@@ -198,7 +198,7 @@ static void aspeed_sdhci_class_init(ObjectClass *classp, void *data)device_class_set_props (dc, aspeed_sdhci_properties); } -static TypeInfo aspeed_sdhci_info = { +static const TypeInfo aspeed_sdhci_info = { .name =TYPE_ASPEED_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (AspeedSDHCIState),
hw/sd/bcm2835_sdhost.c +1 -1
@@ -436,7 +436,7 @@ static void bcm2835_sdhost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_sdhost; } -static TypeInfo bcm2835_sdhost_info = { +static const TypeInfo bcm2835_sdhost_info = { .name =TYPE_BCM2835_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835SDHostState),
hw/sd/cadence_sdhci.c +1 -1
@@ -175,7 +175,7 @@ static void cadence_sdhci_class_init(ObjectClass *classp, void *data) dc->vmsd = &vmstate_cadence_sdhci; } -static TypeInfo cadence_sdhci_info = { +static const TypeInfo cadence_sdhci_info = { .name =TYPE_CADENCE_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (CadenceSDHCIState),
hw/sd/npcm7xx_sdhci.c +1 -1
@@ -166,7 +166,7 @@ static void npcm7xx_sdhci_instance_init(Object *obj) TYPE_SYSBUS_SDHCI); } -static TypeInfo npcm7xx_sdhci_info = { +static const TypeInfo npcm7xx_sdhci_info = { .name =TYPE_NPCM7XX_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (NPCM7xxSDHCIState),
hw/usb/dev-mtp.c +1 -1
@@ -2106,7 +2106,7 @@ static void usb_mtp_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, mtp_properties); } -static TypeInfo mtp_info = { +static const TypeInfo mtp_info = { .name =TYPE_USB_MTP , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (MTPState),
hw/usb/host-libusb.c +1 -1
@@ -1801,7 +1801,7 @@ static void usb_host_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); } -static TypeInfo usb_host_dev_info = { +static const TypeInfo usb_host_dev_info = { .name =TYPE_USB_HOST_DEVICE , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (USBHostDevice),
hw/vfio/igd.c +1 -1
@@ -199,7 +199,7 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; } -static TypeInfo vfio_pci_igd_lpc_bridge_info = { +static const TypeInfo vfio_pci_igd_lpc_bridge_info = { .name ="vfio-pci-igd-lpc-bridge" , .parent =TYPE_PCI_DEVICE , .class_init = vfio_pci_igd_lpc_bridge_class_init,
hw/virtio/virtio-pmem.c +1 -1
@@ -182,7 +182,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo virtio_pmem_info = { +static const TypeInfo virtio_pmem_info = { .name =TYPE_VIRTIO_PMEM , .parent =TYPE_VIRTIO_DEVICE , .class_size =sizeof (VirtIOPMEMClass),
qom/object.c +2 -2
@@ -2793,13 +2793,13 @@ static void object_class_init(ObjectClass *klass, void *data)static void register_types (void ) { -static TypeInfo interface_info = { +static const TypeInfo interface_info = { .name =TYPE_INTERFACE , .class_size =sizeof (InterfaceClass), .abstract = true, }; -static TypeInfo object_info = { +static const TypeInfo object_info = { .name =TYPE_OBJECT , .instance_size =sizeof (Object), .class_init = object_class_init,
Signature · 1 line
2.34.1
Quoted 6 lines · Bernhard Beschow
More than 1k of TypeInfo instances are already marked as const. Mark the remaining ones, too.
This commit was created with:
git grep -z -l 'static TypeInfo' -- '*.c' | \
xargs -0 sed -i 's/static TypeInfo/static const TypeInfo/'
Thanks for updating the commit description.
Since the code part is not changed, let's keep the previous Reviewed-by tags to avoid reviewers spending time checking the same change:
Quoted 42 lines
Signed-off-by Bernhard Beschow <[email protected]>--- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/ipmi/ipmi.c | 4 ++-- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_powermgt.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/bcm2835_rng.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod-tcg.c | 2 +- hw/s390x/tod.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/cadence_sdhci.c | 2 +- hw/sd/npcm7xx_sdhci.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- qom/object.c | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)
Quoted 8 lines · Bernhard Beschow
More than 1k of TypeInfo instances are already marked as const. Mark the remaining ones, too.
This commit was created with:
git grep -z -l 'static TypeInfo' -- '*.c' | \
xargs -0 sed -i 's/static TypeInfo/static const TypeInfo/'Signed-off-by Bernhard Beschow <[email protected]>
Quoted 13 lines
--- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/ipmi/ipmi.c | 4 ++--
For IPMI portions:
Quoted 563 lines
hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_powermgt.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/bcm2835_rng.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod-tcg.c | 2 +- hw/s390x/tod.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/cadence_sdhci.c | 2 +- hw/sd/npcm7xx_sdhci.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- qom/object.c | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)hw/core/generic-loader.c +1
-1@@ -207,7 +207,7 @@ static void generic_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo generic_loader_info = { +static const TypeInfo generic_loader_info = { .name =TYPE_GENERIC_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GenericLoaderState),hw/core/guest-loader.c +1
-1@@ -129,7 +129,7 @@ static void guest_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo guest_loader_info = { +static const TypeInfo guest_loader_info = { .name =TYPE_GUEST_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GuestLoaderState),hw/display/bcm2835_fb.c +1
-1@@ -454,7 +454,7 @@ static void bcm2835_fb_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_fb; } -static TypeInfo bcm2835_fb_info = { +static const TypeInfo bcm2835_fb_info = { .name =TYPE_BCM2835_FB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835FBState),hw/display/i2c-ddc.c +1
-1@@ -113,7 +113,7 @@ static void i2c_ddc_class_init(ObjectClass *oc, void *data) isc->send = i2c_ddc_tx; } -static TypeInfo i2c_ddc_info = { +static const TypeInfo i2c_ddc_info = { .name =TYPE_I2CDDC , .parent =TYPE_I2C_SLAVE , .instance_size =sizeof (I2CDDCState),hw/display/macfb.c +2
-2@@ -783,14 +783,14 @@ static void macfb_nubus_class_init(ObjectClass *klass, void *data)device_class_set_props (dc, macfb_nubus_properties); } -static TypeInfo macfb_sysbus_info = { +static const TypeInfo macfb_sysbus_info = { .name =TYPE_MACFB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (MacfbSysBusState), .class_init = macfb_sysbus_class_init, }; -static TypeInfo macfb_nubus_info = { +static const TypeInfo macfb_nubus_info = { .name =TYPE_NUBUS_MACFB , .parent =TYPE_NUBUS_DEVICE , .instance_size =sizeof (MacfbNubusState),hw/display/virtio-vga.c +1
-1@@ -220,7 +220,7 @@ static void virtio_vga_base_class_init(ObjectClass *klass, void *data) virtio_vga_set_big_endian_fb); } -static TypeInfo virtio_vga_base_info = { +static const TypeInfo virtio_vga_base_info = { .name =TYPE_VIRTIO_VGA_BASE , .parent =TYPE_VIRTIO_PCI , .instance_size =sizeof (VirtIOVGABase),hw/dma/bcm2835_dma.c +1
-1@@ -394,7 +394,7 @@ static void bcm2835_dma_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_dma; } -static TypeInfo bcm2835_dma_info = { +static const TypeInfo bcm2835_dma_info = { .name =TYPE_BCM2835_DMA , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835DMAState),hw/i386/pc_piix.c +1
-1@@ -865,7 +865,7 @@ static void isa_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; }; -static TypeInfo isa_bridge_info = { +static const TypeInfo isa_bridge_info = { .name ="igd-passthrough-isa-bridge" , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PCIDevice),hw/i386/sgx-epc.c +1
-1@@ -167,7 +167,7 @@ static void sgx_epc_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = sgx_epc_md_fill_device_info; } -static TypeInfo sgx_epc_info = { +static const TypeInfo sgx_epc_info = { .name =TYPE_SGX_EPC , .parent =TYPE_DEVICE , .instance_size =sizeof (SGXEPCDevice),hw/intc/bcm2835_ic.c +1
-1@@ -227,7 +227,7 @@ static void bcm2835_ic_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_ic; } -static TypeInfo bcm2835_ic_info = { +static const TypeInfo bcm2835_ic_info = { .name =TYPE_BCM2835_IC , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835ICState),hw/intc/bcm2836_control.c +1
-1@@ -392,7 +392,7 @@ static void bcm2836_control_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2836_control; } -static TypeInfo bcm2836_control_info = { +static const TypeInfo bcm2836_control_info = { .name =TYPE_BCM2836_CONTROL , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2836ControlState),hw/ipmi/ipmi.c +2
-2@@ -85,7 +85,7 @@ static void ipmi_interface_class_init(ObjectClass *class, void *data) ik->do_hw_op = ipmi_do_hw_op; } -static TypeInfo ipmi_interface_type_info = { +static const TypeInfo ipmi_interface_type_info = { .name =TYPE_IPMI_INTERFACE , .parent =TYPE_INTERFACE , .class_size =sizeof (IPMIInterfaceClass),@@ -120,7 +120,7 @@ static void bmc_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, ipmi_bmc_properties); } -static TypeInfo ipmi_bmc_type_info = { +static const TypeInfo ipmi_bmc_type_info = { .name =TYPE_IPMI_BMC , .parent =TYPE_DEVICE , .instance_size =sizeof (IPMIBmc),hw/mem/nvdimm.c +1
-1@@ -248,7 +248,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo nvdimm_info = { +static const TypeInfo nvdimm_info = { .name =TYPE_NVDIMM , .parent =TYPE_PC_DIMM , .class_size =sizeof (NVDIMMClass),hw/mem/pc-dimm.c +1
-1@@ -286,7 +286,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = pc_dimm_md_fill_device_info; } -static TypeInfo pc_dimm_info = { +static const TypeInfo pc_dimm_info = { .name =TYPE_PC_DIMM , .parent =TYPE_DEVICE , .instance_size =sizeof (PCDIMMDevice),hw/misc/bcm2835_mbox.c +1
-1@@ -324,7 +324,7 @@ static void bcm2835_mbox_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_mbox; } -static TypeInfo bcm2835_mbox_info = { +static const TypeInfo bcm2835_mbox_info = { .name =TYPE_BCM2835_MBOX , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835MboxState),hw/misc/bcm2835_powermgt.c +1
-1@@ -144,7 +144,7 @@ static void bcm2835_powermgt_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_powermgt; } -static TypeInfo bcm2835_powermgt_info = { +static const TypeInfo bcm2835_powermgt_info = { .name =TYPE_BCM2835_POWERMGT , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PowerMgtState),hw/misc/bcm2835_property.c +1
-1@@ -421,7 +421,7 @@ static void bcm2835_property_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_property; } -static TypeInfo bcm2835_property_info = { +static const TypeInfo bcm2835_property_info = { .name =TYPE_BCM2835_PROPERTY , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PropertyState),hw/misc/bcm2835_rng.c +1
-1@@ -131,7 +131,7 @@ static void bcm2835_rng_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_rng; } -static TypeInfo bcm2835_rng_info = { +static const TypeInfo bcm2835_rng_info = { .name =TYPE_BCM2835_RNG , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835RngState),hw/misc/pvpanic-isa.c +1
-1@@ -77,7 +77,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_isa_info = { +static const TypeInfo pvpanic_isa_info = { .name =TYPE_PVPANIC_ISA_DEVICE , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PVPanicISAState),hw/misc/pvpanic-pci.c +1
-1@@ -74,7 +74,7 @@ static void pvpanic_pci_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_pci_info = { +static const TypeInfo pvpanic_pci_info = { .name =TYPE_PVPANIC_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PVPanicPCIState),hw/net/fsl_etsec/etsec.c +1
-1@@ -430,7 +430,7 @@ static void etsec_class_init(ObjectClass *klass, void *data) dc->user_creatable = true; } -static TypeInfo etsec_info = { +static const TypeInfo etsec_info = { .name =TYPE_ETSEC_COMMON , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (eTSEC),hw/ppc/prep_systemio.c +1
-1@@ -300,7 +300,7 @@ static void prep_systemio_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, prep_systemio_properties); } -static TypeInfo prep_systemio800_info = { +static const TypeInfo prep_systemio800_info = { .name =TYPE_PREP_SYSTEMIO , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PrepSystemIoState),hw/ppc/spapr_iommu.c +1
-1@@ -685,7 +685,7 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data)spapr_register_hypercall (H_STUFF_TCE , h_stuff_tce); } -static TypeInfo spapr_tce_table_info = { +static const TypeInfo spapr_tce_table_info = { .name =TYPE_SPAPR_TCE_TABLE , .parent =TYPE_DEVICE , .instance_size =sizeof (SpaprTceTable),hw/s390x/s390-pci-bus.c +1
-1@@ -1392,7 +1392,7 @@ static const TypeInfo s390_pci_device_info = { .class_init = s390_pci_device_class_init, }; -static TypeInfo s390_pci_iommu_info = { +static const TypeInfo s390_pci_iommu_info = { .name =TYPE_S390_PCI_IOMMU , .parent =TYPE_OBJECT , .instance_size =sizeof (S390PCIIOMMU ),hw/s390x/sclp.c +1
-1@@ -460,7 +460,7 @@ static void sclp_class_init(ObjectClass *oc, void *data) sc->service_interrupt = service_interrupt; } -static TypeInfo sclp_info = { +static const TypeInfo sclp_info = { .name =TYPE_SCLP , .parent =TYPE_DEVICE , .instance_init = sclp_init,hw/s390x/tod-kvm.c +1
-1@@ -147,7 +147,7 @@ static void kvm_s390_tod_init(Object *obj) td->stopped = false; } -static TypeInfo kvm_s390_tod_info = { +static const TypeInfo kvm_s390_tod_info = { .name =TYPE_KVM_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod-tcg.c +1
-1@@ -73,7 +73,7 @@ static void qemu_s390_tod_init(Object *obj) } } -static TypeInfo qemu_s390_tod_info = { +static const TypeInfo qemu_s390_tod_info = { .name =TYPE_QEMU_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod.c +1
-1@@ -123,7 +123,7 @@ static void s390_tod_class_init(ObjectClass *oc, void *data) dc->user_creatable = false; } -static TypeInfo s390_tod_info = { +static const TypeInfo s390_tod_info = { .name =TYPE_S390_TOD , .parent =TYPE_DEVICE , .instance_size =sizeof (S390TODState),hw/scsi/lsi53c895a.c +1
-1@@ -2352,7 +2352,7 @@ static void lsi53c810_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_LSI_53C810 ; } -static TypeInfo lsi53c810_info = { +static const TypeInfo lsi53c810_info = { .name =TYPE_LSI53C810 , .parent =TYPE_LSI53C895A , .class_init = lsi53c810_class_init,hw/sd/allwinner-sdhost.c +1
-1@@ -835,7 +835,7 @@ static void allwinner_sdhost_sun5i_class_init(ObjectClass *klass, void *data) sc->max_desc_size =64 * KiB; } -static TypeInfo allwinner_sdhost_info = { +static const TypeInfo allwinner_sdhost_info = { .name =TYPE_AW_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_init = allwinner_sdhost_init,hw/sd/aspeed_sdhci.c +1
-1@@ -198,7 +198,7 @@ static void aspeed_sdhci_class_init(ObjectClass *classp, void *data)device_class_set_props (dc, aspeed_sdhci_properties); } -static TypeInfo aspeed_sdhci_info = { +static const TypeInfo aspeed_sdhci_info = { .name =TYPE_ASPEED_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (AspeedSDHCIState),hw/sd/bcm2835_sdhost.c +1
-1@@ -436,7 +436,7 @@ static void bcm2835_sdhost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_sdhost; } -static TypeInfo bcm2835_sdhost_info = { +static const TypeInfo bcm2835_sdhost_info = { .name =TYPE_BCM2835_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835SDHostState),hw/sd/cadence_sdhci.c +1
-1@@ -175,7 +175,7 @@ static void cadence_sdhci_class_init(ObjectClass *classp, void *data) dc->vmsd = &vmstate_cadence_sdhci; } -static TypeInfo cadence_sdhci_info = { +static const TypeInfo cadence_sdhci_info = { .name =TYPE_CADENCE_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (CadenceSDHCIState),hw/sd/npcm7xx_sdhci.c +1
-1@@ -166,7 +166,7 @@ static void npcm7xx_sdhci_instance_init(Object *obj) TYPE_SYSBUS_SDHCI); } -static TypeInfo npcm7xx_sdhci_info = { +static const TypeInfo npcm7xx_sdhci_info = { .name =TYPE_NPCM7XX_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (NPCM7xxSDHCIState),hw/usb/dev-mtp.c +1
-1@@ -2106,7 +2106,7 @@ static void usb_mtp_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, mtp_properties); } -static TypeInfo mtp_info = { +static const TypeInfo mtp_info = { .name =TYPE_USB_MTP , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (MTPState),hw/usb/host-libusb.c +1
-1@@ -1801,7 +1801,7 @@ static void usb_host_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); } -static TypeInfo usb_host_dev_info = { +static const TypeInfo usb_host_dev_info = { .name =TYPE_USB_HOST_DEVICE , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (USBHostDevice),hw/vfio/igd.c +1
-1@@ -199,7 +199,7 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; } -static TypeInfo vfio_pci_igd_lpc_bridge_info = { +static const TypeInfo vfio_pci_igd_lpc_bridge_info = { .name ="vfio-pci-igd-lpc-bridge" , .parent =TYPE_PCI_DEVICE , .class_init = vfio_pci_igd_lpc_bridge_class_init,hw/virtio/virtio-pmem.c +1
-1@@ -182,7 +182,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo virtio_pmem_info = { +static const TypeInfo virtio_pmem_info = { .name =TYPE_VIRTIO_PMEM , .parent =TYPE_VIRTIO_DEVICE , .class_size =sizeof (VirtIOPMEMClass),qom/object.c +2
-2@@ -2793,13 +2793,13 @@ static void object_class_init(ObjectClass *klass, void *data)static void register_types (void ) { -static TypeInfo interface_info = { +static const TypeInfo interface_info = { .name =TYPE_INTERFACE , .class_size =sizeof (InterfaceClass), .abstract = true, }; -static TypeInfo object_info = { +static const TypeInfo object_info = { .name =TYPE_OBJECT , .instance_size =sizeof (Object), .class_init = object_class_init,Signature · 1 line
2.34.1
Quoted 8 lines · Bernhard Beschow
More than 1k of TypeInfo instances are already marked as const. Mark the remaining ones, too.
This commit was created with:
git grep -z -l 'static TypeInfo' -- '*.c' | \
xargs -0 sed -i 's/static TypeInfo/static const TypeInfo/'Signed-off-by Bernhard Beschow <[email protected]>
PPC parts,
Thanks,
C.
Quoted 574 lines
--- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/ipmi/ipmi.c | 4 ++-- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_powermgt.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/bcm2835_rng.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod-tcg.c | 2 +- hw/s390x/tod.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/cadence_sdhci.c | 2 +- hw/sd/npcm7xx_sdhci.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- qom/object.c | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)hw/core/generic-loader.c +1
-1@@ -207,7 +207,7 @@ static void generic_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo generic_loader_info = { +static const TypeInfo generic_loader_info = { .name =TYPE_GENERIC_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GenericLoaderState),hw/core/guest-loader.c +1
-1@@ -129,7 +129,7 @@ static void guest_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo guest_loader_info = { +static const TypeInfo guest_loader_info = { .name =TYPE_GUEST_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GuestLoaderState),hw/display/bcm2835_fb.c +1
-1@@ -454,7 +454,7 @@ static void bcm2835_fb_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_fb; } -static TypeInfo bcm2835_fb_info = { +static const TypeInfo bcm2835_fb_info = { .name =TYPE_BCM2835_FB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835FBState),hw/display/i2c-ddc.c +1
-1@@ -113,7 +113,7 @@ static void i2c_ddc_class_init(ObjectClass *oc, void *data) isc->send = i2c_ddc_tx; } -static TypeInfo i2c_ddc_info = { +static const TypeInfo i2c_ddc_info = { .name =TYPE_I2CDDC , .parent =TYPE_I2C_SLAVE , .instance_size =sizeof (I2CDDCState),hw/display/macfb.c +2
-2@@ -783,14 +783,14 @@ static void macfb_nubus_class_init(ObjectClass *klass, void *data)device_class_set_props (dc, macfb_nubus_properties); } -static TypeInfo macfb_sysbus_info = { +static const TypeInfo macfb_sysbus_info = { .name =TYPE_MACFB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (MacfbSysBusState), .class_init = macfb_sysbus_class_init, }; -static TypeInfo macfb_nubus_info = { +static const TypeInfo macfb_nubus_info = { .name =TYPE_NUBUS_MACFB , .parent =TYPE_NUBUS_DEVICE , .instance_size =sizeof (MacfbNubusState),hw/display/virtio-vga.c +1
-1@@ -220,7 +220,7 @@ static void virtio_vga_base_class_init(ObjectClass *klass, void *data) virtio_vga_set_big_endian_fb); } -static TypeInfo virtio_vga_base_info = { +static const TypeInfo virtio_vga_base_info = { .name =TYPE_VIRTIO_VGA_BASE , .parent =TYPE_VIRTIO_PCI , .instance_size =sizeof (VirtIOVGABase),hw/dma/bcm2835_dma.c +1
-1@@ -394,7 +394,7 @@ static void bcm2835_dma_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_dma; } -static TypeInfo bcm2835_dma_info = { +static const TypeInfo bcm2835_dma_info = { .name =TYPE_BCM2835_DMA , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835DMAState),hw/i386/pc_piix.c +1
-1@@ -865,7 +865,7 @@ static void isa_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; }; -static TypeInfo isa_bridge_info = { +static const TypeInfo isa_bridge_info = { .name ="igd-passthrough-isa-bridge" , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PCIDevice),hw/i386/sgx-epc.c +1
-1@@ -167,7 +167,7 @@ static void sgx_epc_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = sgx_epc_md_fill_device_info; } -static TypeInfo sgx_epc_info = { +static const TypeInfo sgx_epc_info = { .name =TYPE_SGX_EPC , .parent =TYPE_DEVICE , .instance_size =sizeof (SGXEPCDevice),hw/intc/bcm2835_ic.c +1
-1@@ -227,7 +227,7 @@ static void bcm2835_ic_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_ic; } -static TypeInfo bcm2835_ic_info = { +static const TypeInfo bcm2835_ic_info = { .name =TYPE_BCM2835_IC , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835ICState),hw/intc/bcm2836_control.c +1
-1@@ -392,7 +392,7 @@ static void bcm2836_control_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2836_control; } -static TypeInfo bcm2836_control_info = { +static const TypeInfo bcm2836_control_info = { .name =TYPE_BCM2836_CONTROL , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2836ControlState),hw/ipmi/ipmi.c +2
-2@@ -85,7 +85,7 @@ static void ipmi_interface_class_init(ObjectClass *class, void *data) ik->do_hw_op = ipmi_do_hw_op; } -static TypeInfo ipmi_interface_type_info = { +static const TypeInfo ipmi_interface_type_info = { .name =TYPE_IPMI_INTERFACE , .parent =TYPE_INTERFACE , .class_size =sizeof (IPMIInterfaceClass),@@ -120,7 +120,7 @@ static void bmc_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, ipmi_bmc_properties); } -static TypeInfo ipmi_bmc_type_info = { +static const TypeInfo ipmi_bmc_type_info = { .name =TYPE_IPMI_BMC , .parent =TYPE_DEVICE , .instance_size =sizeof (IPMIBmc),hw/mem/nvdimm.c +1
-1@@ -248,7 +248,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo nvdimm_info = { +static const TypeInfo nvdimm_info = { .name =TYPE_NVDIMM , .parent =TYPE_PC_DIMM , .class_size =sizeof (NVDIMMClass),hw/mem/pc-dimm.c +1
-1@@ -286,7 +286,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = pc_dimm_md_fill_device_info; } -static TypeInfo pc_dimm_info = { +static const TypeInfo pc_dimm_info = { .name =TYPE_PC_DIMM , .parent =TYPE_DEVICE , .instance_size =sizeof (PCDIMMDevice),hw/misc/bcm2835_mbox.c +1
-1@@ -324,7 +324,7 @@ static void bcm2835_mbox_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_mbox; } -static TypeInfo bcm2835_mbox_info = { +static const TypeInfo bcm2835_mbox_info = { .name =TYPE_BCM2835_MBOX , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835MboxState),hw/misc/bcm2835_powermgt.c +1
-1@@ -144,7 +144,7 @@ static void bcm2835_powermgt_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_powermgt; } -static TypeInfo bcm2835_powermgt_info = { +static const TypeInfo bcm2835_powermgt_info = { .name =TYPE_BCM2835_POWERMGT , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PowerMgtState),hw/misc/bcm2835_property.c +1
-1@@ -421,7 +421,7 @@ static void bcm2835_property_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_property; } -static TypeInfo bcm2835_property_info = { +static const TypeInfo bcm2835_property_info = { .name =TYPE_BCM2835_PROPERTY , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PropertyState),hw/misc/bcm2835_rng.c +1
-1@@ -131,7 +131,7 @@ static void bcm2835_rng_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_rng; } -static TypeInfo bcm2835_rng_info = { +static const TypeInfo bcm2835_rng_info = { .name =TYPE_BCM2835_RNG , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835RngState),hw/misc/pvpanic-isa.c +1
-1@@ -77,7 +77,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_isa_info = { +static const TypeInfo pvpanic_isa_info = { .name =TYPE_PVPANIC_ISA_DEVICE , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PVPanicISAState),hw/misc/pvpanic-pci.c +1
-1@@ -74,7 +74,7 @@ static void pvpanic_pci_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_pci_info = { +static const TypeInfo pvpanic_pci_info = { .name =TYPE_PVPANIC_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PVPanicPCIState),hw/net/fsl_etsec/etsec.c +1
-1@@ -430,7 +430,7 @@ static void etsec_class_init(ObjectClass *klass, void *data) dc->user_creatable = true; } -static TypeInfo etsec_info = { +static const TypeInfo etsec_info = { .name =TYPE_ETSEC_COMMON , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (eTSEC),hw/ppc/prep_systemio.c +1
-1@@ -300,7 +300,7 @@ static void prep_systemio_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, prep_systemio_properties); } -static TypeInfo prep_systemio800_info = { +static const TypeInfo prep_systemio800_info = { .name =TYPE_PREP_SYSTEMIO , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PrepSystemIoState),hw/ppc/spapr_iommu.c +1
-1@@ -685,7 +685,7 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data)spapr_register_hypercall (H_STUFF_TCE , h_stuff_tce); } -static TypeInfo spapr_tce_table_info = { +static const TypeInfo spapr_tce_table_info = { .name =TYPE_SPAPR_TCE_TABLE , .parent =TYPE_DEVICE , .instance_size =sizeof (SpaprTceTable),hw/s390x/s390-pci-bus.c +1
-1@@ -1392,7 +1392,7 @@ static const TypeInfo s390_pci_device_info = { .class_init = s390_pci_device_class_init, }; -static TypeInfo s390_pci_iommu_info = { +static const TypeInfo s390_pci_iommu_info = { .name =TYPE_S390_PCI_IOMMU , .parent =TYPE_OBJECT , .instance_size =sizeof (S390PCIIOMMU ),hw/s390x/sclp.c +1
-1@@ -460,7 +460,7 @@ static void sclp_class_init(ObjectClass *oc, void *data) sc->service_interrupt = service_interrupt; } -static TypeInfo sclp_info = { +static const TypeInfo sclp_info = { .name =TYPE_SCLP , .parent =TYPE_DEVICE , .instance_init = sclp_init,hw/s390x/tod-kvm.c +1
-1@@ -147,7 +147,7 @@ static void kvm_s390_tod_init(Object *obj) td->stopped = false; } -static TypeInfo kvm_s390_tod_info = { +static const TypeInfo kvm_s390_tod_info = { .name =TYPE_KVM_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod-tcg.c +1
-1@@ -73,7 +73,7 @@ static void qemu_s390_tod_init(Object *obj) } } -static TypeInfo qemu_s390_tod_info = { +static const TypeInfo qemu_s390_tod_info = { .name =TYPE_QEMU_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod.c +1
-1@@ -123,7 +123,7 @@ static void s390_tod_class_init(ObjectClass *oc, void *data) dc->user_creatable = false; } -static TypeInfo s390_tod_info = { +static const TypeInfo s390_tod_info = { .name =TYPE_S390_TOD , .parent =TYPE_DEVICE , .instance_size =sizeof (S390TODState),hw/scsi/lsi53c895a.c +1
-1@@ -2352,7 +2352,7 @@ static void lsi53c810_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_LSI_53C810 ; } -static TypeInfo lsi53c810_info = { +static const TypeInfo lsi53c810_info = { .name =TYPE_LSI53C810 , .parent =TYPE_LSI53C895A , .class_init = lsi53c810_class_init,hw/sd/allwinner-sdhost.c +1
-1@@ -835,7 +835,7 @@ static void allwinner_sdhost_sun5i_class_init(ObjectClass *klass, void *data) sc->max_desc_size =64 * KiB; } -static TypeInfo allwinner_sdhost_info = { +static const TypeInfo allwinner_sdhost_info = { .name =TYPE_AW_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_init = allwinner_sdhost_init,hw/sd/aspeed_sdhci.c +1
-1@@ -198,7 +198,7 @@ static void aspeed_sdhci_class_init(ObjectClass *classp, void *data)device_class_set_props (dc, aspeed_sdhci_properties); } -static TypeInfo aspeed_sdhci_info = { +static const TypeInfo aspeed_sdhci_info = { .name =TYPE_ASPEED_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (AspeedSDHCIState),hw/sd/bcm2835_sdhost.c +1
-1@@ -436,7 +436,7 @@ static void bcm2835_sdhost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_sdhost; } -static TypeInfo bcm2835_sdhost_info = { +static const TypeInfo bcm2835_sdhost_info = { .name =TYPE_BCM2835_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835SDHostState),hw/sd/cadence_sdhci.c +1
-1@@ -175,7 +175,7 @@ static void cadence_sdhci_class_init(ObjectClass *classp, void *data) dc->vmsd = &vmstate_cadence_sdhci; } -static TypeInfo cadence_sdhci_info = { +static const TypeInfo cadence_sdhci_info = { .name =TYPE_CADENCE_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (CadenceSDHCIState),hw/sd/npcm7xx_sdhci.c +1
-1@@ -166,7 +166,7 @@ static void npcm7xx_sdhci_instance_init(Object *obj) TYPE_SYSBUS_SDHCI); } -static TypeInfo npcm7xx_sdhci_info = { +static const TypeInfo npcm7xx_sdhci_info = { .name =TYPE_NPCM7XX_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (NPCM7xxSDHCIState),hw/usb/dev-mtp.c +1
-1@@ -2106,7 +2106,7 @@ static void usb_mtp_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, mtp_properties); } -static TypeInfo mtp_info = { +static const TypeInfo mtp_info = { .name =TYPE_USB_MTP , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (MTPState),hw/usb/host-libusb.c +1
-1@@ -1801,7 +1801,7 @@ static void usb_host_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); } -static TypeInfo usb_host_dev_info = { +static const TypeInfo usb_host_dev_info = { .name =TYPE_USB_HOST_DEVICE , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (USBHostDevice),hw/vfio/igd.c +1
-1@@ -199,7 +199,7 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; } -static TypeInfo vfio_pci_igd_lpc_bridge_info = { +static const TypeInfo vfio_pci_igd_lpc_bridge_info = { .name ="vfio-pci-igd-lpc-bridge" , .parent =TYPE_PCI_DEVICE , .class_init = vfio_pci_igd_lpc_bridge_class_init,hw/virtio/virtio-pmem.c +1
-1@@ -182,7 +182,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo virtio_pmem_info = { +static const TypeInfo virtio_pmem_info = { .name =TYPE_VIRTIO_PMEM , .parent =TYPE_VIRTIO_DEVICE , .class_size =sizeof (VirtIOPMEMClass),qom/object.c +2
-2@@ -2793,13 +2793,13 @@ static void object_class_init(ObjectClass *klass, void *data)static void register_types (void ) { -static TypeInfo interface_info = { +static const TypeInfo interface_info = { .name =TYPE_INTERFACE , .class_size =sizeof (InterfaceClass), .abstract = true, }; -static TypeInfo object_info = { +static const TypeInfo object_info = { .name =TYPE_OBJECT , .instance_size =sizeof (Object), .class_init = object_class_init,
Quoted 8 lines · On Mon, 17 Jan 2022 15:58:04 +0100 Bernhard Beschow <[email protected]> wrote:
More than 1k of TypeInfo instances are already marked as const. Mark the remaining ones, too.
This commit was created with:
git grep -z -l 'static TypeInfo' -- '*.c' | \
xargs -0 sed -i 's/static TypeInfo/static const TypeInfo/'Signed-off-by Bernhard Beschow <[email protected]>
for hw/mem and hw/i386
Quoted 573 lines
--- hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/ipmi/ipmi.c | 4 ++-- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_powermgt.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/bcm2835_rng.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod-tcg.c | 2 +- hw/s390x/tod.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/cadence_sdhci.c | 2 +- hw/sd/npcm7xx_sdhci.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- qom/object.c | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)hw/core/generic-loader.c +1
-1@@ -207,7 +207,7 @@ static void generic_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo generic_loader_info = { +static const TypeInfo generic_loader_info = { .name =TYPE_GENERIC_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GenericLoaderState),hw/core/guest-loader.c +1
-1@@ -129,7 +129,7 @@ static void guest_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo guest_loader_info = { +static const TypeInfo guest_loader_info = { .name =TYPE_GUEST_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GuestLoaderState),hw/display/bcm2835_fb.c +1
-1@@ -454,7 +454,7 @@ static void bcm2835_fb_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_fb; } -static TypeInfo bcm2835_fb_info = { +static const TypeInfo bcm2835_fb_info = { .name =TYPE_BCM2835_FB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835FBState),hw/display/i2c-ddc.c +1
-1@@ -113,7 +113,7 @@ static void i2c_ddc_class_init(ObjectClass *oc, void *data) isc->send = i2c_ddc_tx; } -static TypeInfo i2c_ddc_info = { +static const TypeInfo i2c_ddc_info = { .name =TYPE_I2CDDC , .parent =TYPE_I2C_SLAVE , .instance_size =sizeof (I2CDDCState),hw/display/macfb.c +2
-2@@ -783,14 +783,14 @@ static void macfb_nubus_class_init(ObjectClass *klass, void *data)device_class_set_props (dc, macfb_nubus_properties); } -static TypeInfo macfb_sysbus_info = { +static const TypeInfo macfb_sysbus_info = { .name =TYPE_MACFB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (MacfbSysBusState), .class_init = macfb_sysbus_class_init, }; -static TypeInfo macfb_nubus_info = { +static const TypeInfo macfb_nubus_info = { .name =TYPE_NUBUS_MACFB , .parent =TYPE_NUBUS_DEVICE , .instance_size =sizeof (MacfbNubusState),hw/display/virtio-vga.c +1
-1@@ -220,7 +220,7 @@ static void virtio_vga_base_class_init(ObjectClass *klass, void *data) virtio_vga_set_big_endian_fb); } -static TypeInfo virtio_vga_base_info = { +static const TypeInfo virtio_vga_base_info = { .name =TYPE_VIRTIO_VGA_BASE , .parent =TYPE_VIRTIO_PCI , .instance_size =sizeof (VirtIOVGABase),hw/dma/bcm2835_dma.c +1
-1@@ -394,7 +394,7 @@ static void bcm2835_dma_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_dma; } -static TypeInfo bcm2835_dma_info = { +static const TypeInfo bcm2835_dma_info = { .name =TYPE_BCM2835_DMA , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835DMAState),hw/i386/pc_piix.c +1
-1@@ -865,7 +865,7 @@ static void isa_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; }; -static TypeInfo isa_bridge_info = { +static const TypeInfo isa_bridge_info = { .name ="igd-passthrough-isa-bridge" , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PCIDevice),hw/i386/sgx-epc.c +1
-1@@ -167,7 +167,7 @@ static void sgx_epc_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = sgx_epc_md_fill_device_info; } -static TypeInfo sgx_epc_info = { +static const TypeInfo sgx_epc_info = { .name =TYPE_SGX_EPC , .parent =TYPE_DEVICE , .instance_size =sizeof (SGXEPCDevice),hw/intc/bcm2835_ic.c +1
-1@@ -227,7 +227,7 @@ static void bcm2835_ic_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_ic; } -static TypeInfo bcm2835_ic_info = { +static const TypeInfo bcm2835_ic_info = { .name =TYPE_BCM2835_IC , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835ICState),hw/intc/bcm2836_control.c +1
-1@@ -392,7 +392,7 @@ static void bcm2836_control_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2836_control; } -static TypeInfo bcm2836_control_info = { +static const TypeInfo bcm2836_control_info = { .name =TYPE_BCM2836_CONTROL , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2836ControlState),hw/ipmi/ipmi.c +2
-2@@ -85,7 +85,7 @@ static void ipmi_interface_class_init(ObjectClass *class, void *data) ik->do_hw_op = ipmi_do_hw_op; } -static TypeInfo ipmi_interface_type_info = { +static const TypeInfo ipmi_interface_type_info = { .name =TYPE_IPMI_INTERFACE , .parent =TYPE_INTERFACE , .class_size =sizeof (IPMIInterfaceClass),@@ -120,7 +120,7 @@ static void bmc_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, ipmi_bmc_properties); } -static TypeInfo ipmi_bmc_type_info = { +static const TypeInfo ipmi_bmc_type_info = { .name =TYPE_IPMI_BMC , .parent =TYPE_DEVICE , .instance_size =sizeof (IPMIBmc),hw/mem/nvdimm.c +1
-1@@ -248,7 +248,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo nvdimm_info = { +static const TypeInfo nvdimm_info = { .name =TYPE_NVDIMM , .parent =TYPE_PC_DIMM , .class_size =sizeof (NVDIMMClass),hw/mem/pc-dimm.c +1
-1@@ -286,7 +286,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = pc_dimm_md_fill_device_info; } -static TypeInfo pc_dimm_info = { +static const TypeInfo pc_dimm_info = { .name =TYPE_PC_DIMM , .parent =TYPE_DEVICE , .instance_size =sizeof (PCDIMMDevice),hw/misc/bcm2835_mbox.c +1
-1@@ -324,7 +324,7 @@ static void bcm2835_mbox_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_mbox; } -static TypeInfo bcm2835_mbox_info = { +static const TypeInfo bcm2835_mbox_info = { .name =TYPE_BCM2835_MBOX , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835MboxState),hw/misc/bcm2835_powermgt.c +1
-1@@ -144,7 +144,7 @@ static void bcm2835_powermgt_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_powermgt; } -static TypeInfo bcm2835_powermgt_info = { +static const TypeInfo bcm2835_powermgt_info = { .name =TYPE_BCM2835_POWERMGT , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PowerMgtState),hw/misc/bcm2835_property.c +1
-1@@ -421,7 +421,7 @@ static void bcm2835_property_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_property; } -static TypeInfo bcm2835_property_info = { +static const TypeInfo bcm2835_property_info = { .name =TYPE_BCM2835_PROPERTY , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PropertyState),hw/misc/bcm2835_rng.c +1
-1@@ -131,7 +131,7 @@ static void bcm2835_rng_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_rng; } -static TypeInfo bcm2835_rng_info = { +static const TypeInfo bcm2835_rng_info = { .name =TYPE_BCM2835_RNG , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835RngState),hw/misc/pvpanic-isa.c +1
-1@@ -77,7 +77,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_isa_info = { +static const TypeInfo pvpanic_isa_info = { .name =TYPE_PVPANIC_ISA_DEVICE , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PVPanicISAState),hw/misc/pvpanic-pci.c +1
-1@@ -74,7 +74,7 @@ static void pvpanic_pci_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_pci_info = { +static const TypeInfo pvpanic_pci_info = { .name =TYPE_PVPANIC_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PVPanicPCIState),hw/net/fsl_etsec/etsec.c +1
-1@@ -430,7 +430,7 @@ static void etsec_class_init(ObjectClass *klass, void *data) dc->user_creatable = true; } -static TypeInfo etsec_info = { +static const TypeInfo etsec_info = { .name =TYPE_ETSEC_COMMON , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (eTSEC),hw/ppc/prep_systemio.c +1
-1@@ -300,7 +300,7 @@ static void prep_systemio_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, prep_systemio_properties); } -static TypeInfo prep_systemio800_info = { +static const TypeInfo prep_systemio800_info = { .name =TYPE_PREP_SYSTEMIO , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PrepSystemIoState),hw/ppc/spapr_iommu.c +1
-1@@ -685,7 +685,7 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data)spapr_register_hypercall (H_STUFF_TCE , h_stuff_tce); } -static TypeInfo spapr_tce_table_info = { +static const TypeInfo spapr_tce_table_info = { .name =TYPE_SPAPR_TCE_TABLE , .parent =TYPE_DEVICE , .instance_size =sizeof (SpaprTceTable),hw/s390x/s390-pci-bus.c +1
-1@@ -1392,7 +1392,7 @@ static const TypeInfo s390_pci_device_info = { .class_init = s390_pci_device_class_init, }; -static TypeInfo s390_pci_iommu_info = { +static const TypeInfo s390_pci_iommu_info = { .name =TYPE_S390_PCI_IOMMU , .parent =TYPE_OBJECT , .instance_size =sizeof (S390PCIIOMMU ),hw/s390x/sclp.c +1
-1@@ -460,7 +460,7 @@ static void sclp_class_init(ObjectClass *oc, void *data) sc->service_interrupt = service_interrupt; } -static TypeInfo sclp_info = { +static const TypeInfo sclp_info = { .name =TYPE_SCLP , .parent =TYPE_DEVICE , .instance_init = sclp_init,hw/s390x/tod-kvm.c +1
-1@@ -147,7 +147,7 @@ static void kvm_s390_tod_init(Object *obj) td->stopped = false; } -static TypeInfo kvm_s390_tod_info = { +static const TypeInfo kvm_s390_tod_info = { .name =TYPE_KVM_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod-tcg.c +1
-1@@ -73,7 +73,7 @@ static void qemu_s390_tod_init(Object *obj) } } -static TypeInfo qemu_s390_tod_info = { +static const TypeInfo qemu_s390_tod_info = { .name =TYPE_QEMU_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod.c +1
-1@@ -123,7 +123,7 @@ static void s390_tod_class_init(ObjectClass *oc, void *data) dc->user_creatable = false; } -static TypeInfo s390_tod_info = { +static const TypeInfo s390_tod_info = { .name =TYPE_S390_TOD , .parent =TYPE_DEVICE , .instance_size =sizeof (S390TODState),hw/scsi/lsi53c895a.c +1
-1@@ -2352,7 +2352,7 @@ static void lsi53c810_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_LSI_53C810 ; } -static TypeInfo lsi53c810_info = { +static const TypeInfo lsi53c810_info = { .name =TYPE_LSI53C810 , .parent =TYPE_LSI53C895A , .class_init = lsi53c810_class_init,hw/sd/allwinner-sdhost.c +1
-1@@ -835,7 +835,7 @@ static void allwinner_sdhost_sun5i_class_init(ObjectClass *klass, void *data) sc->max_desc_size =64 * KiB; } -static TypeInfo allwinner_sdhost_info = { +static const TypeInfo allwinner_sdhost_info = { .name =TYPE_AW_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_init = allwinner_sdhost_init,hw/sd/aspeed_sdhci.c +1
-1@@ -198,7 +198,7 @@ static void aspeed_sdhci_class_init(ObjectClass *classp, void *data)device_class_set_props (dc, aspeed_sdhci_properties); } -static TypeInfo aspeed_sdhci_info = { +static const TypeInfo aspeed_sdhci_info = { .name =TYPE_ASPEED_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (AspeedSDHCIState),hw/sd/bcm2835_sdhost.c +1
-1@@ -436,7 +436,7 @@ static void bcm2835_sdhost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_sdhost; } -static TypeInfo bcm2835_sdhost_info = { +static const TypeInfo bcm2835_sdhost_info = { .name =TYPE_BCM2835_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835SDHostState),hw/sd/cadence_sdhci.c +1
-1@@ -175,7 +175,7 @@ static void cadence_sdhci_class_init(ObjectClass *classp, void *data) dc->vmsd = &vmstate_cadence_sdhci; } -static TypeInfo cadence_sdhci_info = { +static const TypeInfo cadence_sdhci_info = { .name =TYPE_CADENCE_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (CadenceSDHCIState),hw/sd/npcm7xx_sdhci.c +1
-1@@ -166,7 +166,7 @@ static void npcm7xx_sdhci_instance_init(Object *obj) TYPE_SYSBUS_SDHCI); } -static TypeInfo npcm7xx_sdhci_info = { +static const TypeInfo npcm7xx_sdhci_info = { .name =TYPE_NPCM7XX_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (NPCM7xxSDHCIState),hw/usb/dev-mtp.c +1
-1@@ -2106,7 +2106,7 @@ static void usb_mtp_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, mtp_properties); } -static TypeInfo mtp_info = { +static const TypeInfo mtp_info = { .name =TYPE_USB_MTP , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (MTPState),hw/usb/host-libusb.c +1
-1@@ -1801,7 +1801,7 @@ static void usb_host_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); } -static TypeInfo usb_host_dev_info = { +static const TypeInfo usb_host_dev_info = { .name =TYPE_USB_HOST_DEVICE , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (USBHostDevice),hw/vfio/igd.c +1
-1@@ -199,7 +199,7 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; } -static TypeInfo vfio_pci_igd_lpc_bridge_info = { +static const TypeInfo vfio_pci_igd_lpc_bridge_info = { .name ="vfio-pci-igd-lpc-bridge" , .parent =TYPE_PCI_DEVICE , .class_init = vfio_pci_igd_lpc_bridge_class_init,hw/virtio/virtio-pmem.c +1
-1@@ -182,7 +182,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo virtio_pmem_info = { +static const TypeInfo virtio_pmem_info = { .name =TYPE_VIRTIO_PMEM , .parent =TYPE_VIRTIO_DEVICE , .class_size =sizeof (VirtIOPMEMClass),qom/object.c +2
-2@@ -2793,13 +2793,13 @@ static void object_class_init(ObjectClass *klass, void *data)static void register_types (void ) { -static TypeInfo interface_info = { +static const TypeInfo interface_info = { .name =TYPE_INTERFACE , .class_size =sizeof (InterfaceClass), .abstract = true, }; -static TypeInfo object_info = { +static const TypeInfo object_info = { .name =TYPE_OBJECT , .instance_size =sizeof (Object), .class_init = object_class_init,
Am 17. Januar 2022 14:58:04 UTC schrieb Bernhard Beschow <[email protected]>:
Quoted 571 lines
More than 1k of TypeInfo instances are already marked as const. Mark the remaining ones, too.
This commit was created with:
git grep -z -l 'static TypeInfo' -- '*.c' | \
xargs -0 sed -i 's/static TypeInfo/static const TypeInfo/'Signed-off-by Bernhard Beschow <[email protected]>---
hw/core/generic-loader.c | 2 +- hw/core/guest-loader.c | 2 +- hw/display/bcm2835_fb.c | 2 +- hw/display/i2c-ddc.c | 2 +- hw/display/macfb.c | 4 ++-- hw/display/virtio-vga.c | 2 +- hw/dma/bcm2835_dma.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/sgx-epc.c | 2 +- hw/intc/bcm2835_ic.c | 2 +- hw/intc/bcm2836_control.c | 2 +- hw/ipmi/ipmi.c | 4 ++-- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/misc/bcm2835_mbox.c | 2 +- hw/misc/bcm2835_powermgt.c | 2 +- hw/misc/bcm2835_property.c | 2 +- hw/misc/bcm2835_rng.c | 2 +- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/ppc/prep_systemio.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/s390x/sclp.c | 2 +- hw/s390x/tod-kvm.c | 2 +- hw/s390x/tod-tcg.c | 2 +- hw/s390x/tod.c | 2 +- hw/scsi/lsi53c895a.c | 2 +- hw/sd/allwinner-sdhost.c | 2 +- hw/sd/aspeed_sdhci.c | 2 +- hw/sd/bcm2835_sdhost.c | 2 +- hw/sd/cadence_sdhci.c | 2 +- hw/sd/npcm7xx_sdhci.c | 2 +- hw/usb/dev-mtp.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/vfio/igd.c | 2 +- hw/virtio/virtio-pmem.c | 2 +- qom/object.c | 4 ++-- 39 files changed, 42 insertions(+), 42 deletions(-)hw/core/generic-loader.c +1
-1@@ -207,7 +207,7 @@ static void generic_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo generic_loader_info = { +static const TypeInfo generic_loader_info = { .name =TYPE_GENERIC_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GenericLoaderState),hw/core/guest-loader.c +1
-1@@ -129,7 +129,7 @@ static void guest_loader_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo guest_loader_info = { +static const TypeInfo guest_loader_info = { .name =TYPE_GUEST_LOADER , .parent =TYPE_DEVICE , .instance_size =sizeof (GuestLoaderState),hw/display/bcm2835_fb.c +1
-1@@ -454,7 +454,7 @@ static void bcm2835_fb_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_fb; } -static TypeInfo bcm2835_fb_info = { +static const TypeInfo bcm2835_fb_info = { .name =TYPE_BCM2835_FB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835FBState),hw/display/i2c-ddc.c +1
-1@@ -113,7 +113,7 @@ static void i2c_ddc_class_init(ObjectClass *oc, void *data) isc->send = i2c_ddc_tx; } -static TypeInfo i2c_ddc_info = { +static const TypeInfo i2c_ddc_info = { .name =TYPE_I2CDDC , .parent =TYPE_I2C_SLAVE , .instance_size =sizeof (I2CDDCState),hw/display/macfb.c +2
-2@@ -783,14 +783,14 @@ static void macfb_nubus_class_init(ObjectClass *klass, void *data)device_class_set_props (dc, macfb_nubus_properties); } -static TypeInfo macfb_sysbus_info = { +static const TypeInfo macfb_sysbus_info = { .name =TYPE_MACFB , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (MacfbSysBusState), .class_init = macfb_sysbus_class_init, }; -static TypeInfo macfb_nubus_info = { +static const TypeInfo macfb_nubus_info = { .name =TYPE_NUBUS_MACFB , .parent =TYPE_NUBUS_DEVICE , .instance_size =sizeof (MacfbNubusState),hw/display/virtio-vga.c +1
-1@@ -220,7 +220,7 @@ static void virtio_vga_base_class_init(ObjectClass *klass, void *data) virtio_vga_set_big_endian_fb); } -static TypeInfo virtio_vga_base_info = { +static const TypeInfo virtio_vga_base_info = { .name =TYPE_VIRTIO_VGA_BASE , .parent =TYPE_VIRTIO_PCI , .instance_size =sizeof (VirtIOVGABase),hw/dma/bcm2835_dma.c +1
-1@@ -394,7 +394,7 @@ static void bcm2835_dma_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_dma; } -static TypeInfo bcm2835_dma_info = { +static const TypeInfo bcm2835_dma_info = { .name =TYPE_BCM2835_DMA , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835DMAState),hw/i386/pc_piix.c +1
-1@@ -865,7 +865,7 @@ static void isa_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; }; -static TypeInfo isa_bridge_info = { +static const TypeInfo isa_bridge_info = { .name ="igd-passthrough-isa-bridge" , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PCIDevice),hw/i386/sgx-epc.c +1
-1@@ -167,7 +167,7 @@ static void sgx_epc_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = sgx_epc_md_fill_device_info; } -static TypeInfo sgx_epc_info = { +static const TypeInfo sgx_epc_info = { .name =TYPE_SGX_EPC , .parent =TYPE_DEVICE , .instance_size =sizeof (SGXEPCDevice),hw/intc/bcm2835_ic.c +1
-1@@ -227,7 +227,7 @@ static void bcm2835_ic_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_ic; } -static TypeInfo bcm2835_ic_info = { +static const TypeInfo bcm2835_ic_info = { .name =TYPE_BCM2835_IC , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835ICState),hw/intc/bcm2836_control.c +1
-1@@ -392,7 +392,7 @@ static void bcm2836_control_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2836_control; } -static TypeInfo bcm2836_control_info = { +static const TypeInfo bcm2836_control_info = { .name =TYPE_BCM2836_CONTROL , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2836ControlState),hw/ipmi/ipmi.c +2
-2@@ -85,7 +85,7 @@ static void ipmi_interface_class_init(ObjectClass *class, void *data) ik->do_hw_op = ipmi_do_hw_op; } -static TypeInfo ipmi_interface_type_info = { +static const TypeInfo ipmi_interface_type_info = { .name =TYPE_IPMI_INTERFACE , .parent =TYPE_INTERFACE , .class_size =sizeof (IPMIInterfaceClass),@@ -120,7 +120,7 @@ static void bmc_class_init(ObjectClass *oc, void *data)device_class_set_props (dc, ipmi_bmc_properties); } -static TypeInfo ipmi_bmc_type_info = { +static const TypeInfo ipmi_bmc_type_info = { .name =TYPE_IPMI_BMC , .parent =TYPE_DEVICE , .instance_size =sizeof (IPMIBmc),hw/mem/nvdimm.c +1
-1@@ -248,7 +248,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo nvdimm_info = { +static const TypeInfo nvdimm_info = { .name =TYPE_NVDIMM , .parent =TYPE_PC_DIMM , .class_size =sizeof (NVDIMMClass),hw/mem/pc-dimm.c +1
-1@@ -286,7 +286,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data) mdc->fill_device_info = pc_dimm_md_fill_device_info; } -static TypeInfo pc_dimm_info = { +static const TypeInfo pc_dimm_info = { .name =TYPE_PC_DIMM , .parent =TYPE_DEVICE , .instance_size =sizeof (PCDIMMDevice),hw/misc/bcm2835_mbox.c +1
-1@@ -324,7 +324,7 @@ static void bcm2835_mbox_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_mbox; } -static TypeInfo bcm2835_mbox_info = { +static const TypeInfo bcm2835_mbox_info = { .name =TYPE_BCM2835_MBOX , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835MboxState),hw/misc/bcm2835_powermgt.c +1
-1@@ -144,7 +144,7 @@ static void bcm2835_powermgt_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_powermgt; } -static TypeInfo bcm2835_powermgt_info = { +static const TypeInfo bcm2835_powermgt_info = { .name =TYPE_BCM2835_POWERMGT , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PowerMgtState),hw/misc/bcm2835_property.c +1
-1@@ -421,7 +421,7 @@ static void bcm2835_property_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_property; } -static TypeInfo bcm2835_property_info = { +static const TypeInfo bcm2835_property_info = { .name =TYPE_BCM2835_PROPERTY , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835PropertyState),hw/misc/bcm2835_rng.c +1
-1@@ -131,7 +131,7 @@ static void bcm2835_rng_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_rng; } -static TypeInfo bcm2835_rng_info = { +static const TypeInfo bcm2835_rng_info = { .name =TYPE_BCM2835_RNG , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835RngState),hw/misc/pvpanic-isa.c +1
-1@@ -77,7 +77,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_isa_info = { +static const TypeInfo pvpanic_isa_info = { .name =TYPE_PVPANIC_ISA_DEVICE , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PVPanicISAState),hw/misc/pvpanic-pci.c +1
-1@@ -74,7 +74,7 @@ static void pvpanic_pci_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_MISC , dc->categories); } -static TypeInfo pvpanic_pci_info = { +static const TypeInfo pvpanic_pci_info = { .name =TYPE_PVPANIC_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PVPanicPCIState),hw/net/fsl_etsec/etsec.c +1
-1@@ -430,7 +430,7 @@ static void etsec_class_init(ObjectClass *klass, void *data) dc->user_creatable = true; } -static TypeInfo etsec_info = { +static const TypeInfo etsec_info = { .name =TYPE_ETSEC_COMMON , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (eTSEC),hw/ppc/prep_systemio.c +1
-1@@ -300,7 +300,7 @@ static void prep_systemio_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, prep_systemio_properties); } -static TypeInfo prep_systemio800_info = { +static const TypeInfo prep_systemio800_info = { .name =TYPE_PREP_SYSTEMIO , .parent =TYPE_ISA_DEVICE , .instance_size =sizeof (PrepSystemIoState),hw/ppc/spapr_iommu.c +1
-1@@ -685,7 +685,7 @@ static void spapr_tce_table_class_init(ObjectClass *klass, void *data)spapr_register_hypercall (H_STUFF_TCE , h_stuff_tce); } -static TypeInfo spapr_tce_table_info = { +static const TypeInfo spapr_tce_table_info = { .name =TYPE_SPAPR_TCE_TABLE , .parent =TYPE_DEVICE , .instance_size =sizeof (SpaprTceTable),hw/s390x/s390-pci-bus.c +1
-1@@ -1392,7 +1392,7 @@ static const TypeInfo s390_pci_device_info = { .class_init = s390_pci_device_class_init, }; -static TypeInfo s390_pci_iommu_info = { +static const TypeInfo s390_pci_iommu_info = { .name =TYPE_S390_PCI_IOMMU , .parent =TYPE_OBJECT , .instance_size =sizeof (S390PCIIOMMU ),hw/s390x/sclp.c +1
-1@@ -460,7 +460,7 @@ static void sclp_class_init(ObjectClass *oc, void *data) sc->service_interrupt = service_interrupt; } -static TypeInfo sclp_info = { +static const TypeInfo sclp_info = { .name =TYPE_SCLP , .parent =TYPE_DEVICE , .instance_init = sclp_init,hw/s390x/tod-kvm.c +1
-1@@ -147,7 +147,7 @@ static void kvm_s390_tod_init(Object *obj) td->stopped = false; } -static TypeInfo kvm_s390_tod_info = { +static const TypeInfo kvm_s390_tod_info = { .name =TYPE_KVM_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod-tcg.c +1
-1@@ -73,7 +73,7 @@ static void qemu_s390_tod_init(Object *obj) } } -static TypeInfo qemu_s390_tod_info = { +static const TypeInfo qemu_s390_tod_info = { .name =TYPE_QEMU_S390_TOD , .parent =TYPE_S390_TOD , .instance_size =sizeof (S390TODState),hw/s390x/tod.c +1
-1@@ -123,7 +123,7 @@ static void s390_tod_class_init(ObjectClass *oc, void *data) dc->user_creatable = false; } -static TypeInfo s390_tod_info = { +static const TypeInfo s390_tod_info = { .name =TYPE_S390_TOD , .parent =TYPE_DEVICE , .instance_size =sizeof (S390TODState),hw/scsi/lsi53c895a.c +1
-1@@ -2352,7 +2352,7 @@ static void lsi53c810_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_LSI_53C810 ; } -static TypeInfo lsi53c810_info = { +static const TypeInfo lsi53c810_info = { .name =TYPE_LSI53C810 , .parent =TYPE_LSI53C895A , .class_init = lsi53c810_class_init,hw/sd/allwinner-sdhost.c +1
-1@@ -835,7 +835,7 @@ static void allwinner_sdhost_sun5i_class_init(ObjectClass *klass, void *data) sc->max_desc_size =64 * KiB; } -static TypeInfo allwinner_sdhost_info = { +static const TypeInfo allwinner_sdhost_info = { .name =TYPE_AW_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_init = allwinner_sdhost_init,hw/sd/aspeed_sdhci.c +1
-1@@ -198,7 +198,7 @@ static void aspeed_sdhci_class_init(ObjectClass *classp, void *data)device_class_set_props (dc, aspeed_sdhci_properties); } -static TypeInfo aspeed_sdhci_info = { +static const TypeInfo aspeed_sdhci_info = { .name =TYPE_ASPEED_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (AspeedSDHCIState),hw/sd/bcm2835_sdhost.c +1
-1@@ -436,7 +436,7 @@ static void bcm2835_sdhost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bcm2835_sdhost; } -static TypeInfo bcm2835_sdhost_info = { +static const TypeInfo bcm2835_sdhost_info = { .name =TYPE_BCM2835_SDHOST , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (BCM2835SDHostState),hw/sd/cadence_sdhci.c +1
-1@@ -175,7 +175,7 @@ static void cadence_sdhci_class_init(ObjectClass *classp, void *data) dc->vmsd = &vmstate_cadence_sdhci; } -static TypeInfo cadence_sdhci_info = { +static const TypeInfo cadence_sdhci_info = { .name =TYPE_CADENCE_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (CadenceSDHCIState),hw/sd/npcm7xx_sdhci.c +1
-1@@ -166,7 +166,7 @@ static void npcm7xx_sdhci_instance_init(Object *obj) TYPE_SYSBUS_SDHCI); } -static TypeInfo npcm7xx_sdhci_info = { +static const TypeInfo npcm7xx_sdhci_info = { .name =TYPE_NPCM7XX_SDHCI , .parent =TYPE_SYS_BUS_DEVICE , .instance_size =sizeof (NPCM7xxSDHCIState),hw/usb/dev-mtp.c +1
-1@@ -2106,7 +2106,7 @@ static void usb_mtp_class_initfn(ObjectClass *klass, void *data)device_class_set_props (dc, mtp_properties); } -static TypeInfo mtp_info = { +static const TypeInfo mtp_info = { .name =TYPE_USB_MTP , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (MTPState),hw/usb/host-libusb.c +1
-1@@ -1801,7 +1801,7 @@ static void usb_host_class_initfn(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); } -static TypeInfo usb_host_dev_info = { +static const TypeInfo usb_host_dev_info = { .name =TYPE_USB_HOST_DEVICE , .parent =TYPE_USB_DEVICE , .instance_size =sizeof (USBHostDevice),hw/vfio/igd.c +1
-1@@ -199,7 +199,7 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_BRIDGE_ISA ; } -static TypeInfo vfio_pci_igd_lpc_bridge_info = { +static const TypeInfo vfio_pci_igd_lpc_bridge_info = { .name ="vfio-pci-igd-lpc-bridge" , .parent =TYPE_PCI_DEVICE , .class_init = vfio_pci_igd_lpc_bridge_class_init,hw/virtio/virtio-pmem.c +1
-1@@ -182,7 +182,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); } -static TypeInfo virtio_pmem_info = { +static const TypeInfo virtio_pmem_info = { .name =TYPE_VIRTIO_PMEM , .parent =TYPE_VIRTIO_DEVICE , .class_size =sizeof (VirtIOPMEMClass),qom/object.c +1
-1@@ -2793,13 +2793,13 @@ static void object_class_init(ObjectClass *klass, void *data)static void register_types (void ) { -static TypeInfo interface_info = { +static const TypeInfo interface_info = {
qom/object.c static void object_class_init(ObjectClass *klass, void *data) · line 2805
Quoted 10 lines
qom/object.c +1
-1.name = TYPE_INTERFACE, .class_size = sizeof(InterfaceClass), .abstract = true, }; -static TypeInfo object_info = { +static const TypeInfo object_info = { .name =TYPE_OBJECT , .instance_size =sizeof (Object), .class_init = object_class_init,
Ping
PATCH v2 2/2 checkpatch: Ensure that TypeInfos are const
In reply to Bernhard BeschowNow that all static TypeInfo instances are declared const, prevent that new non-const instances are created.
--- scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+)
scripts/checkpatch.pl +1 -0
@@ -2883,6 +2883,7 @@ sub process { SCSIBusInfo| SCSIReqOps| Spice[A-Z][a-zA-Z0-9]*Interface| + TypeInfo| USBDesc[A-Z][a-zA-Z0-9]*| VhostOps| VMStateDescription|
Signature · 1 line
2.34.1
Re: [PATCH v2 2/2] checkpatch: Ensure that TypeInfos are const
Quoted 7 lines · Bernhard Beschow
Now that all static TypeInfo instances are declared const, prevent that new non-const instances are created.
Signed-off-by Bernhard Beschow <[email protected]>--- scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+)
Thanks!
Peter Maydell
AppliedQuoted 8 lines · Bernhard Beschow
Applied review comments:
* Mention the sed-expression used for the cleanup in the commit message
* Have checkpatch.pl error on further non-const TypeInfo introductionBernhard Beschow (2):
Mark remaining global TypeInfo instances as const
checkpatch: Ensure that TypeInfos are const
Applied to target-arm.next, thanks.
-- PMM