From 4240abff5a6fb5d88867b51f46c0235518dac564 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Mon, 20 Aug 2012 19:07:56 +0200 Subject: [PATCH] pci: Make host bridge TypeInfos const MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit During the QOM migration they were amended with further info but this is no longer the case. All static TypeInfos can be const these days. Signed-off-by: Andreas Färber Acked-by: Michael S. Tsirkin Signed-off-by: Anthony Liguori --- hw/alpha_typhoon.c | 2 +- hw/bonito.c | 4 ++-- hw/dec_pci.c | 6 +++--- hw/grackle_pci.c | 4 ++-- hw/gt64xxx.c | 4 ++-- hw/piix_pci.c | 8 ++++---- hw/ppc4xx_pci.c | 4 ++-- hw/ppce500_pci.c | 4 ++-- hw/prep_pci.c | 4 ++-- hw/spapr_pci.c | 2 +- hw/unin_pci.c | 16 ++++++++-------- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c index 872e1122e8..cc637375c8 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -817,7 +817,7 @@ static void typhoon_pcihost_class_init(ObjectClass *klass, void *data) dc->no_user = 1; } -static TypeInfo typhoon_pcihost_info = { +static const TypeInfo typhoon_pcihost_info = { .name = "typhoon-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(TyphoonState), diff --git a/hw/bonito.c b/hw/bonito.c index 77786f8883..b990875cf0 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -781,7 +781,7 @@ static void bonito_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_bonito; } -static TypeInfo bonito_info = { +static const TypeInfo bonito_info = { .name = "Bonito", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIBonitoState), @@ -797,7 +797,7 @@ static void bonito_pcihost_class_init(ObjectClass *klass, void *data) dc->no_user = 1; } -static TypeInfo bonito_pcihost_info = { +static const TypeInfo bonito_pcihost_info = { .name = "Bonito-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(BonitoState), diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 37337bf4b6..5194a9fc7d 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -66,7 +66,7 @@ static void dec_21154_pci_bridge_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_pci_device; } -static TypeInfo dec_21154_pci_bridge_info = { +static const TypeInfo dec_21154_pci_bridge_info = { .name = "dec-21154-p2p-bridge", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIBridge), @@ -119,7 +119,7 @@ static void dec_21154_pci_host_class_init(ObjectClass *klass, void *data) k->is_bridge = 1; } -static TypeInfo dec_21154_pci_host_info = { +static const TypeInfo dec_21154_pci_host_info = { .name = "dec-21154", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -133,7 +133,7 @@ static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data) sdc->init = pci_dec_21154_device_init; } -static TypeInfo pci_dec_21154_device_info = { +static const TypeInfo pci_dec_21154_device_info = { .name = "dec-21154-sysbus", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(DECState), diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 81ff3a339a..35667ade0b 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -134,7 +134,7 @@ static void grackle_pci_class_init(ObjectClass *klass, void *data) dc->no_user = 1; } -static TypeInfo grackle_pci_info = { +static const TypeInfo grackle_pci_info = { .name = "grackle", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -150,7 +150,7 @@ static void pci_grackle_class_init(ObjectClass *klass, void *data) dc->no_user = 1; } -static TypeInfo grackle_pci_host_info = { +static const TypeInfo grackle_pci_host_info = { .name = "grackle-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(GrackleState), diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index a2d0e5a2c3..04831bb07f 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -1147,7 +1147,7 @@ static void gt64120_pci_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_HOST; } -static TypeInfo gt64120_pci_info = { +static const TypeInfo gt64120_pci_info = { .name = "gt64120_pci", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -1161,7 +1161,7 @@ static void gt64120_class_init(ObjectClass *klass, void *data) sdc->init = gt64120_init; } -static TypeInfo gt64120_info = { +static const TypeInfo gt64120_info = { .name = "gt64120", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(GT64120State), diff --git a/hw/piix_pci.c b/hw/piix_pci.c index c497a014af..0b06a75a8d 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -537,7 +537,7 @@ static void piix3_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_ISA; } -static TypeInfo piix3_info = { +static const TypeInfo piix3_info = { .name = "PIIX3", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIX3State), @@ -560,7 +560,7 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_ISA; }; -static TypeInfo piix3_xen_info = { +static const TypeInfo piix3_xen_info = { .name = "PIIX3-xen", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIX3State), @@ -584,7 +584,7 @@ static void i440fx_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_i440fx; } -static TypeInfo i440fx_info = { +static const TypeInfo i440fx_info = { .name = "i440FX", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCII440FXState), @@ -601,7 +601,7 @@ static void i440fx_pcihost_class_init(ObjectClass *klass, void *data) dc->no_user = 1; } -static TypeInfo i440fx_pcihost_info = { +static const TypeInfo i440fx_pcihost_info = { .name = "i440FX-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(I440FXState), diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 203c3cdc47..104ed98cb3 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -377,7 +377,7 @@ static void ppc4xx_host_bridge_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_OTHER; } -static TypeInfo ppc4xx_host_bridge_info = { +static const TypeInfo ppc4xx_host_bridge_info = { .name = "ppc4xx-host-bridge", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -393,7 +393,7 @@ static void ppc4xx_pcihost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_ppc4xx_pci; } -static TypeInfo ppc4xx_pcihost_info = { +static const TypeInfo ppc4xx_pcihost_info = { .name = "ppc4xx-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PPC4xxPCIState), diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index 0f60b24134..99748b311f 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -350,7 +350,7 @@ static void e500_host_bridge_class_init(ObjectClass *klass, void *data) dc->desc = "Host bridge"; } -static TypeInfo e500_host_bridge_info = { +static const TypeInfo e500_host_bridge_info = { .name = "e500-host-bridge", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -366,7 +366,7 @@ static void e500_pcihost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_ppce500_pci; } -static TypeInfo e500_pcihost_info = { +static const TypeInfo e500_pcihost_info = { .name = "e500-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PPCE500PCIState), diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 38dbff44a1..a8cdc21bb4 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -166,7 +166,7 @@ static void raven_class_init(ObjectClass *klass, void *data) dc->no_user = 1; } -static TypeInfo raven_info = { +static const TypeInfo raven_info = { .name = "raven", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(RavenPCIState), @@ -183,7 +183,7 @@ static void raven_pcihost_class_init(ObjectClass *klass, void *data) dc->no_user = 1; } -static TypeInfo raven_pcihost_info = { +static const TypeInfo raven_pcihost_info = { .name = "raven-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PREPPCIState), diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index b92583a991..c57ab1ee2b 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -612,7 +612,7 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data) dc->props = spapr_phb_properties; } -static TypeInfo spapr_phb_info = { +static const TypeInfo spapr_phb_info = { .name = "spapr-pci-host-bridge", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(sPAPRPHBState), diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 409bcd4cc6..2b309dfe82 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -350,7 +350,7 @@ static void unin_main_pci_host_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_HOST; } -static TypeInfo unin_main_pci_host_info = { +static const TypeInfo unin_main_pci_host_info = { .name = "uni-north-pci", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -368,7 +368,7 @@ static void u3_agp_pci_host_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_HOST; } -static TypeInfo u3_agp_pci_host_info = { +static const TypeInfo u3_agp_pci_host_info = { .name = "u3-agp", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -386,7 +386,7 @@ static void unin_agp_pci_host_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_HOST; } -static TypeInfo unin_agp_pci_host_info = { +static const TypeInfo unin_agp_pci_host_info = { .name = "uni-north-agp", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -404,7 +404,7 @@ static void unin_internal_pci_host_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_HOST; } -static TypeInfo unin_internal_pci_host_info = { +static const TypeInfo unin_internal_pci_host_info = { .name = "uni-north-internal-pci", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), @@ -418,7 +418,7 @@ static void pci_unin_main_class_init(ObjectClass *klass, void *data) sbc->init = pci_unin_main_init_device; } -static TypeInfo pci_unin_main_info = { +static const TypeInfo pci_unin_main_info = { .name = "uni-north-pci-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(UNINState), @@ -432,7 +432,7 @@ static void pci_u3_agp_class_init(ObjectClass *klass, void *data) sbc->init = pci_u3_agp_init_device; } -static TypeInfo pci_u3_agp_info = { +static const TypeInfo pci_u3_agp_info = { .name = "u3-agp-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(UNINState), @@ -446,7 +446,7 @@ static void pci_unin_agp_class_init(ObjectClass *klass, void *data) sbc->init = pci_unin_agp_init_device; } -static TypeInfo pci_unin_agp_info = { +static const TypeInfo pci_unin_agp_info = { .name = "uni-north-agp-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(UNINState), @@ -460,7 +460,7 @@ static void pci_unin_internal_class_init(ObjectClass *klass, void *data) sbc->init = pci_unin_internal_init_device; } -static TypeInfo pci_unin_internal_info = { +static const TypeInfo pci_unin_internal_info = { .name = "uni-north-internal-pci-pcihost", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(UNINState), -- 2.11.4.GIT