From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwkVV-00043x-2a for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:47:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwkVT-0000DW-EL for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:47:21 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 2 Aug 2012 03:46:53 +0200 Message-Id: <1343872026-18189-2-git-send-email-afaerber@suse.de> In-Reply-To: <1343872026-18189-1-git-send-email-afaerber@suse.de> References: <1343872026-18189-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-1.2 v5 01/14] pci: Make host bridge TypeInfos const List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:New World" , anthony@codemonkey.ws, Scott Wood , =?UTF-8?q?Andreas=20F=C3=A4rber?= , David Gibson 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=C3=A4rber --- 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 872e112..cc63737 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -817,7 +817,7 @@ static void typhoon_pcihost_class_init(ObjectClass *k= lass, void *data) dc->no_user =3D 1; } =20 -static TypeInfo typhoon_pcihost_info =3D { +static const TypeInfo typhoon_pcihost_info =3D { .name =3D "typhoon-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(TyphoonState), diff --git a/hw/bonito.c b/hw/bonito.c index 77786f8..b990875 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -781,7 +781,7 @@ static void bonito_class_init(ObjectClass *klass, voi= d *data) dc->vmsd =3D &vmstate_bonito; } =20 -static TypeInfo bonito_info =3D { +static const TypeInfo bonito_info =3D { .name =3D "Bonito", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIBonitoState), @@ -797,7 +797,7 @@ static void bonito_pcihost_class_init(ObjectClass *kl= ass, void *data) dc->no_user =3D 1; } =20 -static TypeInfo bonito_pcihost_info =3D { +static const TypeInfo bonito_pcihost_info =3D { .name =3D "Bonito-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(BonitoState), diff --git a/hw/dec_pci.c b/hw/dec_pci.c index 37337bf..5194a9f 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 =3D &vmstate_pci_device; } =20 -static TypeInfo dec_21154_pci_bridge_info =3D { +static const TypeInfo dec_21154_pci_bridge_info =3D { .name =3D "dec-21154-p2p-bridge", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIBridge), @@ -119,7 +119,7 @@ static void dec_21154_pci_host_class_init(ObjectClass= *klass, void *data) k->is_bridge =3D 1; } =20 -static TypeInfo dec_21154_pci_host_info =3D { +static const TypeInfo dec_21154_pci_host_info =3D { .name =3D "dec-21154", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -133,7 +133,7 @@ static void pci_dec_21154_device_class_init(ObjectCla= ss *klass, void *data) sdc->init =3D pci_dec_21154_device_init; } =20 -static TypeInfo pci_dec_21154_device_info =3D { +static const TypeInfo pci_dec_21154_device_info =3D { .name =3D "dec-21154-sysbus", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(DECState), diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 81ff3a3..35667ad 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 =3D 1; } =20 -static TypeInfo grackle_pci_info =3D { +static const TypeInfo grackle_pci_info =3D { .name =3D "grackle", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -150,7 +150,7 @@ static void pci_grackle_class_init(ObjectClass *klass= , void *data) dc->no_user =3D 1; } =20 -static TypeInfo grackle_pci_host_info =3D { +static const TypeInfo grackle_pci_host_info =3D { .name =3D "grackle-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(GrackleState), diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index a2d0e5a..04831bb 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -1147,7 +1147,7 @@ static void gt64120_pci_class_init(ObjectClass *kla= ss, void *data) k->class_id =3D PCI_CLASS_BRIDGE_HOST; } =20 -static TypeInfo gt64120_pci_info =3D { +static const TypeInfo gt64120_pci_info =3D { .name =3D "gt64120_pci", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -1161,7 +1161,7 @@ static void gt64120_class_init(ObjectClass *klass, = void *data) sdc->init =3D gt64120_init; } =20 -static TypeInfo gt64120_info =3D { +static const TypeInfo gt64120_info =3D { .name =3D "gt64120", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(GT64120State), diff --git a/hw/piix_pci.c b/hw/piix_pci.c index c497a01..0b06a75 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 =3D PCI_CLASS_BRIDGE_ISA; } =20 -static TypeInfo piix3_info =3D { +static const TypeInfo piix3_info =3D { .name =3D "PIIX3", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PIIX3State), @@ -560,7 +560,7 @@ static void piix3_xen_class_init(ObjectClass *klass, = void *data) k->class_id =3D PCI_CLASS_BRIDGE_ISA; }; =20 -static TypeInfo piix3_xen_info =3D { +static const TypeInfo piix3_xen_info =3D { .name =3D "PIIX3-xen", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PIIX3State), @@ -584,7 +584,7 @@ static void i440fx_class_init(ObjectClass *klass, voi= d *data) dc->vmsd =3D &vmstate_i440fx; } =20 -static TypeInfo i440fx_info =3D { +static const TypeInfo i440fx_info =3D { .name =3D "i440FX", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCII440FXState), @@ -601,7 +601,7 @@ static void i440fx_pcihost_class_init(ObjectClass *kl= ass, void *data) dc->no_user =3D 1; } =20 -static TypeInfo i440fx_pcihost_info =3D { +static const TypeInfo i440fx_pcihost_info =3D { .name =3D "i440FX-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(I440FXState), diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 203c3cd..104ed98 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 =3D PCI_CLASS_BRIDGE_OTHER; } =20 -static TypeInfo ppc4xx_host_bridge_info =3D { +static const TypeInfo ppc4xx_host_bridge_info =3D { .name =3D "ppc4xx-host-bridge", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -393,7 +393,7 @@ static void ppc4xx_pcihost_class_init(ObjectClass *kl= ass, void *data) dc->vmsd =3D &vmstate_ppc4xx_pci; } =20 -static TypeInfo ppc4xx_pcihost_info =3D { +static const TypeInfo ppc4xx_pcihost_info =3D { .name =3D "ppc4xx-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PPC4xxPCIState), diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index 0f60b24..99748b3 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 =3D "Host bridge"; } =20 -static TypeInfo e500_host_bridge_info =3D { +static const TypeInfo e500_host_bridge_info =3D { .name =3D "e500-host-bridge", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -366,7 +366,7 @@ static void e500_pcihost_class_init(ObjectClass *klas= s, void *data) dc->vmsd =3D &vmstate_ppce500_pci; } =20 -static TypeInfo e500_pcihost_info =3D { +static const TypeInfo e500_pcihost_info =3D { .name =3D "e500-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PPCE500PCIState), diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 38dbff4..a8cdc21 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 =3D 1; } =20 -static TypeInfo raven_info =3D { +static const TypeInfo raven_info =3D { .name =3D "raven", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(RavenPCIState), @@ -183,7 +183,7 @@ static void raven_pcihost_class_init(ObjectClass *kla= ss, void *data) dc->no_user =3D 1; } =20 -static TypeInfo raven_pcihost_info =3D { +static const TypeInfo raven_pcihost_info =3D { .name =3D "raven-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PREPPCIState), diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index b2e4f78..b901d34 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -368,7 +368,7 @@ static void spapr_phb_class_init(ObjectClass *klass, = void *data) spapr_rtas_register("ibm,write-pci-config", rtas_ibm_write_pci_confi= g); } =20 -static TypeInfo spapr_phb_info =3D { +static const TypeInfo spapr_phb_info =3D { .name =3D "spapr-pci-host-bridge", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(sPAPRPHBState), diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 409bcd4..2b309df 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 =3D PCI_CLASS_BRIDGE_HOST; } =20 -static TypeInfo unin_main_pci_host_info =3D { +static const TypeInfo unin_main_pci_host_info =3D { .name =3D "uni-north-pci", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -368,7 +368,7 @@ static void u3_agp_pci_host_class_init(ObjectClass *k= lass, void *data) k->class_id =3D PCI_CLASS_BRIDGE_HOST; } =20 -static TypeInfo u3_agp_pci_host_info =3D { +static const TypeInfo u3_agp_pci_host_info =3D { .name =3D "u3-agp", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -386,7 +386,7 @@ static void unin_agp_pci_host_class_init(ObjectClass = *klass, void *data) k->class_id =3D PCI_CLASS_BRIDGE_HOST; } =20 -static TypeInfo unin_agp_pci_host_info =3D { +static const TypeInfo unin_agp_pci_host_info =3D { .name =3D "uni-north-agp", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -404,7 +404,7 @@ static void unin_internal_pci_host_class_init(ObjectC= lass *klass, void *data) k->class_id =3D PCI_CLASS_BRIDGE_HOST; } =20 -static TypeInfo unin_internal_pci_host_info =3D { +static const TypeInfo unin_internal_pci_host_info =3D { .name =3D "uni-north-internal-pci", .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIDevice), @@ -418,7 +418,7 @@ static void pci_unin_main_class_init(ObjectClass *kla= ss, void *data) sbc->init =3D pci_unin_main_init_device; } =20 -static TypeInfo pci_unin_main_info =3D { +static const TypeInfo pci_unin_main_info =3D { .name =3D "uni-north-pci-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), @@ -432,7 +432,7 @@ static void pci_u3_agp_class_init(ObjectClass *klass,= void *data) sbc->init =3D pci_u3_agp_init_device; } =20 -static TypeInfo pci_u3_agp_info =3D { +static const TypeInfo pci_u3_agp_info =3D { .name =3D "u3-agp-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), @@ -446,7 +446,7 @@ static void pci_unin_agp_class_init(ObjectClass *klas= s, void *data) sbc->init =3D pci_unin_agp_init_device; } =20 -static TypeInfo pci_unin_agp_info =3D { +static const TypeInfo pci_unin_agp_info =3D { .name =3D "uni-north-agp-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), @@ -460,7 +460,7 @@ static void pci_unin_internal_class_init(ObjectClass = *klass, void *data) sbc->init =3D pci_unin_internal_init_device; } =20 -static TypeInfo pci_unin_internal_info =3D { +static const TypeInfo pci_unin_internal_info =3D { .name =3D "uni-north-internal-pci-pcihost", .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(UNINState), --=20 1.7.7