On Wed, Apr 22, 2015 at 01:28:16AM -0500, Michael Roth wrote: > This option enables/disables PCI hotplug for a particular PHB. > > Also add machine compatibility code to disable it by default for machine > types prior to pseries-2.4. > > Signed-off-by: Michael Roth <[email protected]> > Reviewed-by: David Gibson <[email protected]> > --- > hw/ppc/spapr.c | 15 ++++++++++++++- > hw/ppc/spapr_pci.c | 2 ++ > include/hw/pci-host/spapr.h | 1 + > 3 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 6fab4d3..837b36d 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1806,12 +1806,20 @@ static const TypeInfo spapr_machine_info = { > }, > }; > > +#define SPAPR_COMPAT_2_3 \ > + {\ > + .driver = "spapr-pci-host-bridge",\ > + .property = "dynamic-reconfiguration",\ > + .value = "off",\ > + } > + > #define SPAPR_COMPAT_2_2 \ > {\ > .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ > .property = "mem_win_size",\ > .value = "0x20000000",\ > - } > + },\ > + SPAPR_COMPAT_2_3
Convention in PC and other places seems to be to put the next version
compat macro at the top of the definition, rather than the bottom.
>
> #define SPAPR_COMPAT_2_1 \
> SPAPR_COMPAT_2_2
> @@ -1857,12 +1865,17 @@ static const TypeInfo spapr_machine_2_2_info = {
>
> static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data)
> {
> + static GlobalProperty compat_props[] = {
> + SPAPR_COMPAT_2_3,
> + { /* end of list */ }
> + };
> MachineClass *mc = MACHINE_CLASS(oc);
>
> mc->name = "pseries-2.3";
> mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3";
> mc->alias = "pseries";
> mc->is_default = 0;
> + mc->compat_props = compat_props;
> }
>
> static const TypeInfo spapr_machine_2_3_info = {
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 52c5c73..a2dcc6a 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -936,6 +936,8 @@ static Property spapr_phb_properties[] = {
> DEFINE_PROP_UINT64("io_win_addr", sPAPRPHBState, io_win_addr, -1),
> DEFINE_PROP_UINT64("io_win_size", sPAPRPHBState, io_win_size,
> SPAPR_PCI_IO_WIN_SIZE),
> + DEFINE_PROP_BOOL("dynamic-reconfiguration", sPAPRPHBState, dr_enabled,
> + true),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
> index 5b497ce..9dca388 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -71,6 +71,7 @@ struct sPAPRPHBState {
> uint32_t index;
> uint64_t buid;
> char *dtbusname;
> + bool dr_enabled;
>
> MemoryRegion memspace, iospace;
> hwaddr mem_win_addr, mem_win_size, io_win_addr, io_win_size;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
pgpkrlWGR40bW.pgp
Description: PGP signature
