| Message ID | 20180703152359.16618-1-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | [for-3.0] spapr/vio: quiet down the "irq" property accessors | expand |
On Tue, Jul 03, 2018 at 05:23:59PM +0200, Cédric Le Goater wrote: > commit efe2add7cb7f ("spapr/vio: deprecate the "irq" property") > introduced get/set accessors for the "irq" property to warn of its > usage, but the warning in the get pollutes the monitor 'info qtree'. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Applied to ppc-for-3.0. > --- > hw/ppc/spapr_vio.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c > index daf85130b5ef..be9af71437cc 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -43,7 +43,16 @@ > > #include <libfdt.h> > > -static void spapr_vio_getset_irq(Object *obj, Visitor *v, const char *name, > +static void spapr_vio_get_irq(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + Property *prop = opaque; > + uint32_t *ptr = qdev_get_prop_ptr(DEVICE(obj), prop); > + > + visit_type_uint32(v, name, ptr, errp); > +} > + > +static void spapr_vio_set_irq(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > Property *prop = opaque; > @@ -57,8 +66,8 @@ static void spapr_vio_getset_irq(Object *obj, Visitor *v, const char *name, > > static const PropertyInfo spapr_vio_irq_propinfo = { > .name = "irq", > - .get = spapr_vio_getset_irq, > - .set = spapr_vio_getset_irq, > + .get = spapr_vio_get_irq, > + .set = spapr_vio_set_irq, > }; > > static Property spapr_vio_props[] = {
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index daf85130b5ef..be9af71437cc 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -43,7 +43,16 @@ #include <libfdt.h> -static void spapr_vio_getset_irq(Object *obj, Visitor *v, const char *name, +static void spapr_vio_get_irq(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + Property *prop = opaque; + uint32_t *ptr = qdev_get_prop_ptr(DEVICE(obj), prop); + + visit_type_uint32(v, name, ptr, errp); +} + +static void spapr_vio_set_irq(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -57,8 +66,8 @@ static void spapr_vio_getset_irq(Object *obj, Visitor *v, const char *name, static const PropertyInfo spapr_vio_irq_propinfo = { .name = "irq", - .get = spapr_vio_getset_irq, - .set = spapr_vio_getset_irq, + .get = spapr_vio_get_irq, + .set = spapr_vio_set_irq, }; static Property spapr_vio_props[] = {
commit efe2add7cb7f ("spapr/vio: deprecate the "irq" property") introduced get/set accessors for the "irq" property to warn of its usage, but the warning in the get pollutes the monitor 'info qtree'. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/ppc/spapr_vio.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)