From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghBAW-0004nr-9O for qemu-devel@nongnu.org; Wed, 09 Jan 2019 05:33:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghBAV-0003d6-FP for qemu-devel@nongnu.org; Wed, 09 Jan 2019 05:33:04 -0500 References: <20190109103028.24723-1-clg@kaod.org> From: Thomas Huth Message-ID: Date: Wed, 9 Jan 2019 11:32:58 +0100 MIME-Version: 1.0 In-Reply-To: <20190109103028.24723-1-clg@kaod.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] spapr/vio: remove the "irq" property" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , David Gibson Cc: Greg Kurz , qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 2019-01-09 11:30, C=C3=A9dric Le Goater wrote: > commit efe2add7cb7f ("spapr/vio: deprecate the "irq" property") was > merged in QEMU version 3.0. The "irq" property" can be removed for > QEMU version 4.0, 2 version later. >=20 > Signed-off-by: C=C3=A9dric Le Goater > --- >=20 > The machine uselessly allocates an IRQ number for the sPAPR NVRAM. > This is harmless but still a little ugly. >=20 > hw/ppc/spapr_vio.c | 47 ++++++---------------------------------------- > 1 file changed, 6 insertions(+), 41 deletions(-) >=20 > diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c > index 7e8a9ad09337..414673d31341 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -44,38 +44,6 @@ > =20 > #define SPAPR_VIO_REG_BASE 0x71000000 > =20 > -static void spapr_vio_get_irq(Object *obj, Visitor *v, const char *nam= e, > - void *opaque, Error **errp) > -{ > - Property *prop =3D opaque; > - uint32_t *ptr =3D 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 *nam= e, > - void *opaque, Error **errp) > -{ > - Property *prop =3D opaque; > - uint32_t *ptr =3D qdev_get_prop_ptr(DEVICE(obj), prop); > - > - if (!qtest_enabled()) { > - warn_report(TYPE_VIO_SPAPR_DEVICE " '%s' property is deprecate= d", name); > - } > - visit_type_uint32(v, name, ptr, errp); > -} > - > -static const PropertyInfo spapr_vio_irq_propinfo =3D { > - .name =3D "irq", > - .get =3D spapr_vio_get_irq, > - .set =3D spapr_vio_set_irq, > -}; > - > -static Property spapr_vio_props[] =3D { > - DEFINE_PROP("irq", VIOsPAPRDevice, irq, spapr_vio_irq_propinfo, ui= nt32_t), > - DEFINE_PROP_END_OF_LIST(), > -}; > - > static char *spapr_vio_get_dev_name(DeviceState *qdev) > { > VIOsPAPRDevice *dev =3D VIO_SPAPR_DEVICE(qdev); > @@ -534,15 +502,13 @@ static void spapr_vio_busdev_realize(DeviceState = *qdev, Error **errp) > dev->qdev.id =3D id; > } > =20 > - if (!dev->irq) { > - dev->irq =3D spapr_vio_reg_to_irq(dev->reg); > + dev->irq =3D spapr_vio_reg_to_irq(dev->reg); > =20 > - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { > - dev->irq =3D spapr_irq_findone(spapr, &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > - return; > - } > + if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { > + dev->irq =3D spapr_irq_findone(spapr, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > } > } > =20 > @@ -668,7 +634,6 @@ static void vio_spapr_device_class_init(ObjectClass= *klass, void *data) > k->realize =3D spapr_vio_busdev_realize; > k->reset =3D spapr_vio_busdev_reset; > k->bus_type =3D TYPE_SPAPR_VIO_BUS; > - k->props =3D spapr_vio_props; > } > =20 > static const TypeInfo spapr_vio_type_info =3D { >=20 Looks good to me. Reviewed-by: Thomas Huth