Ping, can any qapi folks comment or provide an ack/review for this please? Thanks!
Alex On Wed, 10 Jan 2018 12:02:24 -0700 Alex Williamson <[email protected]> wrote: > Add an option which allows the user to specify a PCI BAR number, > including an 'off' and 'auto' selection. > > Cc: Markus Armbruster <[email protected]> > Cc: Eric Blake <[email protected]> > Signed-off-by: Alex Williamson <[email protected]> > --- > hw/core/qdev-properties.c | 11 +++++++++++ > include/hw/qdev-properties.h | 4 ++++ > qapi/common.json | 26 ++++++++++++++++++++++++++ > 3 files changed, 41 insertions(+) > > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index 1dc80fcea2af..e33184e5a342 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -1256,3 +1256,14 @@ const PropertyInfo qdev_prop_link = { > .name = "link", > .create = create_link_property, > }; > + > +/* --- OffAutoPCIBAR off/auto/bar0/bar1/bar2/bar3/bar4/bar5 --- */ > + > +const PropertyInfo qdev_prop_off_auto_pcibar = { > + .name = "OffAutoPCIBAR", > + .description = "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", > + .enum_table = &OffAutoPCIBAR_lookup, > + .get = get_enum, > + .set = set_enum, > + .set_default_value = set_default_value_enum, > +}; > diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h > index 60b42ac561af..e2643f5126c4 100644 > --- a/include/hw/qdev-properties.h > +++ b/include/hw/qdev-properties.h > @@ -33,6 +33,7 @@ extern const PropertyInfo qdev_prop_blocksize; > extern const PropertyInfo qdev_prop_pci_host_devaddr; > extern const PropertyInfo qdev_prop_arraylen; > extern const PropertyInfo qdev_prop_link; > +extern const PropertyInfo qdev_prop_off_auto_pcibar; > > #define DEFINE_PROP(_name, _state, _field, _prop, _type) { \ > .name = (_name), \ > @@ -213,6 +214,9 @@ extern const PropertyInfo qdev_prop_link; > DEFINE_PROP(_n, _s, _f, qdev_prop_pci_host_devaddr, PCIHostDeviceAddress) > #define DEFINE_PROP_MEMORY_REGION(_n, _s, _f) \ > DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, MemoryRegion *) > +#define DEFINE_PROP_OFF_AUTO_PCIBAR(_n, _s, _f, _d) \ > + DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_off_auto_pcibar, \ > + OffAutoPCIBAR) > > #define DEFINE_PROP_END_OF_LIST() \ > {} > diff --git a/qapi/common.json b/qapi/common.json > index 6eb01821ef59..d9b14dd429f3 100644 > --- a/qapi/common.json > +++ b/qapi/common.json > @@ -100,3 +100,29 @@ > { 'alternate': 'StrOrNull', > 'data': { 's': 'str', > 'n': 'null' } } > + > +## > +# @OffAutoPCIBAR: > +# > +# An enumeration of options for specifying a PCI BAR > +# > +# @off: The specified feature is disabled > +# > +# @auto: The PCI BAR for the feature is automatically selected > +# > +# @bar0: PCI BAR0 is used for the feature > +# > +# @bar1: PCI BAR1 is used for the feature > +# > +# @bar2: PCI BAR2 is used for the feature > +# > +# @bar3: PCI BAR3 is used for the feature > +# > +# @bar4: PCI BAR4 is used for the feature > +# > +# @bar5: PCI BAR5 is used for the feature > +# > +# Since: 2.12 > +## > +{ 'enum': 'OffAutoPCIBAR', > + 'data': [ 'off', 'auto', 'bar0', 'bar1', 'bar2', 'bar3', 'bar4', 'bar5' ] } >
