From nobody Thu Sep 19 01:41:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549271279481832.2815126650902; Mon, 4 Feb 2019 01:07:59 -0800 (PST) Received: from localhost ([127.0.0.1]:38977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqaEO-0004si-CK for importer@patchew.org; Mon, 04 Feb 2019 04:07:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqa8f-0000aq-F8 for qemu-devel@nongnu.org; Mon, 04 Feb 2019 04:02:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqa8d-0007bD-Ov for qemu-devel@nongnu.org; Mon, 04 Feb 2019 04:02:01 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:34495) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqa8b-0007CM-LU; Mon, 04 Feb 2019 04:01:59 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 43tMC61tPjz9sNC; Mon, 4 Feb 2019 20:01:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1549270898; bh=JGAGCr9/HkBE9OZcXZUZanJgHGZAY72AS+n8jxYMfbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lpOZD4N3BhMbxGkuGzqaAhIy5g/B3fIgYMScBgbIDmXSxUEH94csEXw0fXSZ1Btrn k9i2tPiU03qBoKFL1UZyJq9YrtPXfkF1zs95WbfEyBWQfdQ6tKbY8L1aYEDGSUp+lK CZSFJptWrBOENZcCuj0ctKHWQLnmbINVZPcxG0gs= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 4 Feb 2019 20:00:58 +1100 Message-Id: <20190204090124.26191-12-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204090124.26191-1-david@gibson.dropbear.id.au> References: <20190204090124.26191-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 11/37] spapr/vio: remove the "irq" property" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, Thomas Huth , qemu-devel@nongnu.org, groug@kaod.org, spopovyc@redhat.com, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater 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. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Thomas Huth Reviewed-by: Greg Kurz Signed-off-by: David Gibson --- hw/ppc/spapr_vio.c | 47 ++++++-------------------------------------- qemu-deprecated.texi | 6 ------ 2 files changed, 6 insertions(+), 47 deletions(-) diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 7e8a9ad093..414673d313 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 *name, - 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 *name, - 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 deprecated", = 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, uint32= _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 *qde= v, 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 *kl= ass, 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 { diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index dfb278a377..9cc20b365c 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -160,9 +160,3 @@ Example of legacy encoding: The above, converted to the current supported format: =20 @code{json:@{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"@}} - -@subsection vio-spapr-device device options - -@subsubsection "irq": "" (since 3.0.0) - -The ``irq'' property is obsoleted. --=20 2.20.1