From nobody Mon Feb 9 12:27:18 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1569301603; cv=none; d=zoho.com; s=zohoarc; b=HRfW3UWjmObP7J37R+b7LI4JsUlLT5gu2Ebq3ySkjXDZ5lzutvIhWf0xks/EATANARM3MZQJSoUFpgfu/Mte4UCtzLfkNYqQJKZKXFRemWH8hC45kFanDlzJBY5iTttxmyrlR0r3y4aA+HiXs3b0cR+chmp8tdgoKNtcLdT1b/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569301603; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=GsV6n+dGcWWlhxpYDWee8zHKACJGcEOJKMhrkyQlKNI=; b=Oho/Yo8BZn6IvXxiALK/6i4y4D1ijrApc2+rWy2/NmUWepeFNQpdTc8AiBVEO+gH8jSqv2t7nouLqQm4iLchAQG1abE2kC0aUaTj+cxGoKmYlMVEUJKTh33vdjSKuGexoar3fG4E/CSbUwna4HKMAZ3eAQCS/6tL+XYZZtL9tZU= ARC-Authentication-Results: i=1; mx.zoho.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 1569301603789582.3823308549361; Mon, 23 Sep 2019 22:06:43 -0700 (PDT) Received: from localhost ([::1]:40828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCd2A-0006WC-Jw for importer@patchew.org; Tue, 24 Sep 2019 01:06:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51590) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCcvm-0001GE-8e for qemu-devel@nongnu.org; Tue, 24 Sep 2019 01:00:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCcvk-0001wP-Et for qemu-devel@nongnu.org; Tue, 24 Sep 2019 01:00:06 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:54705 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCcvj-0001rj-DV; Tue, 24 Sep 2019 01:00:04 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46cps82hvMz9sDB; Tue, 24 Sep 2019 14:59:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1569301196; bh=NvzW3pnMMJChizCRdRFvUt5F8TLEmnoMIBQj4iEAKrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O54prG5rBf/QhOYKtPtaBC8J/MnLepKXEPiKqb3iVA80pz9Wc694HfeTazRg3A6GP 6lHT6o3eiiGAx7Wxb0D2mDfFq8H9HtNH1FzzYntOYfkkteU+8ZUyrxUC15XcdD0f98 C4eh739OMtJRA+C2PUtJsgdI8V8IezhfcYvaDfnY= From: David Gibson To: qemu-ppc@nongnu.org, clg@kaod.org Subject: [PATCH 2/4] xics: Merge reset and realize hooks Date: Tue, 24 Sep 2019 14:59:50 +1000 Message-Id: <20190924045952.11412-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190924045952.11412-1-david@gibson.dropbear.id.au> References: <20190924045952.11412-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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gkurz@kaod.org, qemu-devel@nongnu.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" Currently TYPE_XICS_BASE and TYPE_XICS_SIMPLE have their own reset and realize methods, using the standard technique for having the subtype call the supertype's methods before doing its own thing. But TYPE_XICS_SIMPLE is the only subtype of TYPE_XICS_BASE ever instantiated, so there's no point having the split here. Merge them together into just ics_reset() and ics_realize() functions. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz --- hw/intc/xics.c | 97 ++++++++++++++++--------------------------- include/hw/ppc/xics.h | 3 -- 2 files changed, 35 insertions(+), 65 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 93139b0189..db0e532bd9 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -548,68 +548,13 @@ static void ics_eoi(ICSState *ics, uint32_t nr) } } =20 -static void ics_simple_reset(DeviceState *dev) -{ - ICSStateClass *icsc =3D ICS_BASE_GET_CLASS(dev); - - icsc->parent_reset(dev); - - if (kvm_irqchip_in_kernel()) { - Error *local_err =3D NULL; - - ics_set_kvm_state(ICS_BASE(dev), &local_err); - if (local_err) { - error_report_err(local_err); - } - } -} - -static void ics_simple_reset_handler(void *dev) -{ - ics_simple_reset(dev); -} - -static void ics_simple_realize(DeviceState *dev, Error **errp) -{ - ICSState *ics =3D ICS_SIMPLE(dev); - ICSStateClass *icsc =3D ICS_BASE_GET_CLASS(ics); - Error *local_err =3D NULL; - - icsc->parent_realize(dev, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - - qemu_register_reset(ics_simple_reset_handler, ics); -} - -static void ics_simple_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - ICSStateClass *isc =3D ICS_BASE_CLASS(klass); - - device_class_set_parent_realize(dc, ics_simple_realize, - &isc->parent_realize); - device_class_set_parent_reset(dc, ics_simple_reset, - &isc->parent_reset); -} - -static const TypeInfo ics_simple_info =3D { - .name =3D TYPE_ICS_SIMPLE, - .parent =3D TYPE_ICS_BASE, - .instance_size =3D sizeof(ICSState), - .class_init =3D ics_simple_class_init, - .class_size =3D sizeof(ICSStateClass), -}; - static void ics_reset_irq(ICSIRQState *irq) { irq->priority =3D 0xff; irq->saved_priority =3D 0xff; } =20 -static void ics_base_reset(DeviceState *dev) +static void ics_reset(DeviceState *dev) { ICSState *ics =3D ICS_BASE(dev); int i; @@ -625,17 +570,31 @@ static void ics_base_reset(DeviceState *dev) ics_reset_irq(ics->irqs + i); ics->irqs[i].flags =3D flags[i]; } + + if (kvm_irqchip_in_kernel()) { + Error *local_err =3D NULL; + + ics_set_kvm_state(ICS_BASE(dev), &local_err); + if (local_err) { + error_report_err(local_err); + } + } +} + +static void ics_reset_handler(void *dev) +{ + ics_reset(dev); } =20 -static void ics_base_realize(DeviceState *dev, Error **errp) +static void ics_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS_BASE(dev); + Error *local_err =3D NULL; Object *obj; - Error *err =3D NULL; =20 - obj =3D object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &err); + obj =3D object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &local_er= r); if (!obj) { - error_propagate_prepend(errp, err, + error_propagate_prepend(errp, local_err, "required link '" ICS_PROP_XICS "' not found: "); return; @@ -647,8 +606,22 @@ static void ics_base_realize(DeviceState *dev, Error *= *errp) return; } ics->irqs =3D g_malloc0(ics->nr_irqs * sizeof(ICSIRQState)); + + qemu_register_reset(ics_reset_handler, ics); +} + +static void ics_simple_class_init(ObjectClass *klass, void *data) +{ } =20 +static const TypeInfo ics_simple_info =3D { + .name =3D TYPE_ICS_SIMPLE, + .parent =3D TYPE_ICS_BASE, + .instance_size =3D sizeof(ICSState), + .class_init =3D ics_simple_class_init, + .class_size =3D sizeof(ICSStateClass), +}; + static void ics_base_instance_init(Object *obj) { ICSState *ics =3D ICS_BASE(obj); @@ -725,9 +698,9 @@ static void ics_base_class_init(ObjectClass *klass, voi= d *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->realize =3D ics_base_realize; + dc->realize =3D ics_realize; dc->props =3D ics_base_properties; - dc->reset =3D ics_base_reset; + dc->reset =3D ics_reset; dc->vmsd =3D &vmstate_ics_base; } =20 diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 34d7985b7c..0eb39c2561 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -103,9 +103,6 @@ struct PnvICPState { =20 struct ICSStateClass { DeviceClass parent_class; - - DeviceRealize parent_realize; - DeviceReset parent_reset; }; =20 struct ICSState { --=20 2.21.0