mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Make all static TypeInfos const
Since 39bffca203 (qdev: register all
types natively through QEMU Object Model), TypeInfo as used in
the common, non-iterative pattern is no longer amended with information
and should therefore be const.
Fix the documented QOM examples:
sed -i 's/static TypeInfo/static const TypeInfo/g' include/qom/object.h
Since frequently the wrong examples are being copied by contributors of
new devices, fix all types in the tree:
sed -i 's/^static TypeInfo/static const TypeInfo/g' */*.c
sed -i 's/^static TypeInfo/static const TypeInfo/g' */*/*.c
This also avoids to piggy-back these changes onto real functional
changes or other refactorings.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
committed by
Anthony Liguori
parent
a6308bc222
commit
8c43a6f05d
+1
-1
@@ -207,7 +207,7 @@ static void rng_egd_class_init(ObjectClass *klass, void *data)
|
||||
rbc->opened = rng_egd_opened;
|
||||
}
|
||||
|
||||
static TypeInfo rng_egd_info = {
|
||||
static const TypeInfo rng_egd_info = {
|
||||
.name = TYPE_RNG_EGD,
|
||||
.parent = TYPE_RNG_BACKEND,
|
||||
.instance_size = sizeof(RngEgd),
|
||||
|
||||
@@ -144,7 +144,7 @@ static void rng_random_class_init(ObjectClass *klass, void *data)
|
||||
rbc->opened = rng_random_opened;
|
||||
}
|
||||
|
||||
static TypeInfo rng_random_info = {
|
||||
static const TypeInfo rng_random_info = {
|
||||
.name = TYPE_RNG_RANDOM,
|
||||
.parent = TYPE_RNG_BACKEND,
|
||||
.instance_size = sizeof(RndRandom),
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ static void rng_backend_init(Object *obj)
|
||||
NULL);
|
||||
}
|
||||
|
||||
static TypeInfo rng_backend_info = {
|
||||
static const TypeInfo rng_backend_info = {
|
||||
.name = TYPE_RNG_BACKEND,
|
||||
.parent = TYPE_OBJECT,
|
||||
.instance_size = sizeof(RngBackend),
|
||||
|
||||
@@ -177,7 +177,7 @@ static void virtio_9p_class_init(ObjectClass *klass, void *data)
|
||||
dc->reset = virtio_pci_reset;
|
||||
}
|
||||
|
||||
static TypeInfo virtio_9p_info = {
|
||||
static const TypeInfo virtio_9p_info = {
|
||||
.name = "virtio-9p-pci",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(VirtIOPCIProxy),
|
||||
|
||||
+1
-1
@@ -93,7 +93,7 @@ static void a15mp_priv_class_init(ObjectClass *klass, void *data)
|
||||
/* We currently have no savable state */
|
||||
}
|
||||
|
||||
static TypeInfo a15mp_priv_info = {
|
||||
static const TypeInfo a15mp_priv_info = {
|
||||
.name = "a15mpcore_priv",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(A15MPPrivState),
|
||||
|
||||
+1
-1
@@ -226,7 +226,7 @@ static void a9mp_priv_class_init(ObjectClass *klass, void *data)
|
||||
dc->reset = a9mp_priv_reset;
|
||||
}
|
||||
|
||||
static TypeInfo a9mp_priv_info = {
|
||||
static const TypeInfo a9mp_priv_info = {
|
||||
.name = "a9mpcore_priv",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(a9mp_priv_state),
|
||||
|
||||
@@ -1423,7 +1423,7 @@ static void ac97_class_init (ObjectClass *klass, void *data)
|
||||
dc->props = ac97_properties;
|
||||
}
|
||||
|
||||
static TypeInfo ac97_info = {
|
||||
static const TypeInfo ac97_info = {
|
||||
.name = "AC97",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof (AC97LinkState),
|
||||
|
||||
+1
-1
@@ -487,7 +487,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
|
||||
dc->props = piix4_pm_properties;
|
||||
}
|
||||
|
||||
static TypeInfo piix4_pm_info = {
|
||||
static const TypeInfo piix4_pm_info = {
|
||||
.name = "PIIX4_PM",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(PIIX4PMState),
|
||||
|
||||
+1
-1
@@ -162,7 +162,7 @@ static void ads7846_class_init(ObjectClass *klass, void *data)
|
||||
k->transfer = ads7846_transfer;
|
||||
}
|
||||
|
||||
static TypeInfo ads7846_info = {
|
||||
static const TypeInfo ads7846_info = {
|
||||
.name = "ads7846",
|
||||
.parent = TYPE_SSI_SLAVE,
|
||||
.instance_size = sizeof(ADS7846State),
|
||||
|
||||
+3
-3
@@ -486,7 +486,7 @@ static void pbm_pci_host_class_init(ObjectClass *klass, void *data)
|
||||
k->class_id = PCI_CLASS_BRIDGE_HOST;
|
||||
}
|
||||
|
||||
static TypeInfo pbm_pci_host_info = {
|
||||
static const TypeInfo pbm_pci_host_info = {
|
||||
.name = "pbm-pci",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(PCIDevice),
|
||||
@@ -502,7 +502,7 @@ static void pbm_host_class_init(ObjectClass *klass, void *data)
|
||||
dc->reset = pci_pbm_reset;
|
||||
}
|
||||
|
||||
static TypeInfo pbm_host_info = {
|
||||
static const TypeInfo pbm_host_info = {
|
||||
.name = "pbm",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(APBState),
|
||||
@@ -525,7 +525,7 @@ static void pbm_pci_bridge_class_init(ObjectClass *klass, void *data)
|
||||
dc->vmsd = &vmstate_pci_device;
|
||||
}
|
||||
|
||||
static TypeInfo pbm_pci_bridge_info = {
|
||||
static const TypeInfo pbm_pci_bridge_info = {
|
||||
.name = "pbm-bridge",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(PCIBridge),
|
||||
|
||||
@@ -895,7 +895,7 @@ static void apic_class_init(ObjectClass *klass, void *data)
|
||||
k->post_load = apic_post_load;
|
||||
}
|
||||
|
||||
static TypeInfo apic_info = {
|
||||
static const TypeInfo apic_info = {
|
||||
.name = "apic",
|
||||
.instance_size = sizeof(APICCommonState),
|
||||
.parent = TYPE_APIC_COMMON,
|
||||
|
||||
+1
-1
@@ -385,7 +385,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data)
|
||||
sc->init = apic_init_common;
|
||||
}
|
||||
|
||||
static TypeInfo apic_common_type = {
|
||||
static const TypeInfo apic_common_type = {
|
||||
.name = TYPE_APIC_COMMON,
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(APICCommonState),
|
||||
|
||||
+1
-1
@@ -236,7 +236,7 @@ static void qdev_applesmc_class_init(ObjectClass *klass, void *data)
|
||||
dc->props = applesmc_isa_properties;
|
||||
}
|
||||
|
||||
static TypeInfo applesmc_isa_info = {
|
||||
static const TypeInfo applesmc_isa_info = {
|
||||
.name = "isa-applesmc",
|
||||
.parent = TYPE_ISA_DEVICE,
|
||||
.instance_size = sizeof(struct AppleSMCStatus),
|
||||
|
||||
+2
-2
@@ -222,7 +222,7 @@ static void mpcore_rirq_class_init(ObjectClass *klass, void *data)
|
||||
dc->props = mpcore_rirq_properties;
|
||||
}
|
||||
|
||||
static TypeInfo mpcore_rirq_info = {
|
||||
static const TypeInfo mpcore_rirq_info = {
|
||||
.name = "realview_mpcore",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(mpcore_rirq_state),
|
||||
@@ -252,7 +252,7 @@ static void mpcore_priv_class_init(ObjectClass *klass, void *data)
|
||||
dc->props = mpcore_priv_properties;
|
||||
}
|
||||
|
||||
static TypeInfo mpcore_priv_info = {
|
||||
static const TypeInfo mpcore_priv_info = {
|
||||
.name = "arm11mpcore_priv",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(mpcore_priv_state),
|
||||
|
||||
+1
-1
@@ -703,7 +703,7 @@ static void arm_gic_class_init(ObjectClass *klass, void *data)
|
||||
dc->no_user = 1;
|
||||
}
|
||||
|
||||
static TypeInfo arm_gic_info = {
|
||||
static const TypeInfo arm_gic_info = {
|
||||
.name = TYPE_ARM_GIC,
|
||||
.parent = TYPE_ARM_GIC_COMMON,
|
||||
.instance_size = sizeof(GICState),
|
||||
|
||||
+1
-1
@@ -171,7 +171,7 @@ static void arm_gic_common_class_init(ObjectClass *klass, void *data)
|
||||
sc->init = arm_gic_common_init;
|
||||
}
|
||||
|
||||
static TypeInfo arm_gic_common_type = {
|
||||
static const TypeInfo arm_gic_common_type = {
|
||||
.name = TYPE_ARM_GIC_COMMON,
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(GICState),
|
||||
|
||||
+1
-1
@@ -179,7 +179,7 @@ static void l2x0_class_init(ObjectClass *klass, void *data)
|
||||
dc->reset = l2x0_priv_reset;
|
||||
}
|
||||
|
||||
static TypeInfo l2x0_info = {
|
||||
static const TypeInfo l2x0_info = {
|
||||
.name = "l2x0",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(l2x0_state),
|
||||
|
||||
+1
-1
@@ -329,7 +329,7 @@ static void arm_mptimer_class_init(ObjectClass *klass, void *data)
|
||||
dc->props = arm_mptimer_properties;
|
||||
}
|
||||
|
||||
static TypeInfo arm_mptimer_info = {
|
||||
static const TypeInfo arm_mptimer_info = {
|
||||
.name = "arm_mptimer",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(arm_mptimer_state),
|
||||
|
||||
+1
-1
@@ -410,7 +410,7 @@ static void arm_sysctl_class_init(ObjectClass *klass, void *data)
|
||||
dc->props = arm_sysctl_properties;
|
||||
}
|
||||
|
||||
static TypeInfo arm_sysctl_info = {
|
||||
static const TypeInfo arm_sysctl_info = {
|
||||
.name = "realview_sysctl",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(arm_sysctl_state),
|
||||
|
||||
+2
-2
@@ -361,7 +361,7 @@ static void icp_pit_class_init(ObjectClass *klass, void *data)
|
||||
sdc->init = icp_pit_init;
|
||||
}
|
||||
|
||||
static TypeInfo icp_pit_info = {
|
||||
static const TypeInfo icp_pit_info = {
|
||||
.name = "integrator_pit",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(icp_pit_state),
|
||||
@@ -383,7 +383,7 @@ static void sp804_class_init(ObjectClass *klass, void *data)
|
||||
k->props = sp804_properties;
|
||||
}
|
||||
|
||||
static TypeInfo sp804_info = {
|
||||
static const TypeInfo sp804_info = {
|
||||
.name = "sp804",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(sp804_state),
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user