From nobody Wed Nov 5 17:40:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496738211201834.9345125862839; Tue, 6 Jun 2017 01:36:51 -0700 (PDT) Received: from localhost ([::1]:36838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9yr-0006wK-Q9 for importer@patchew.org; Tue, 06 Jun 2017 04:36:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9ul-0003Ov-8f for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9uf-00021T-LV for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:34 -0400 Received: from ozlabs.org ([103.22.144.67]:43207) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9uf-00020X-35; Tue, 06 Jun 2017 04:32:29 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL22QP2z9s3s; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737946; bh=OPNllUrtkxtpfhxHgHZ1kk6c0xli/bumnOaZrjRZw5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVN6COJZAMeHCdwA7ujMiW84NmSpSwWg+Ku/mcDBV9Ae7YLXUH+aljamTcs3pbWU+ OYK0E9NNujhMNq9vCaJpKc2wBXp1jPH3jJ+YnM9BxrBfktTzegz5zYnDySgPPmeCuO V+UwXZNp7Kk9TnY/HpknRqAXVNiDc/x6aNckN+xw= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:16 +1000 Message-Id: <20170606083221.9299-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 2/7] spapr: Abolish DRC get_name method 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, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" DRConnectorClass has a get_name method, however: * There's only one implementation, and only ever likely to be one * There's exactly one caller, which is (now) local * The implementation is trivial So just open-code what we need. Signed-off-by: David Gibson Reviewed-by: Michael Roth --- hw/ppc/spapr_drc.c | 11 ++--------- include/hw/ppc/spapr_drc.h | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index da3779e..9140b48 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -167,11 +167,6 @@ static uint32_t set_allocation_state(sPAPRDRConnector = *drc, return RTAS_OUT_SUCCESS; } =20 -static const char *get_name(sPAPRDRConnector *drc) -{ - return drc->name; -} - /* has the guest been notified of device attachment? */ static void set_signalled(sPAPRDRConnector *drc) { @@ -221,8 +216,7 @@ static void prop_get_index(Object *obj, Visitor *v, con= st char *name, static char *prop_get_name(Object *obj, Error **errp) { sPAPRDRConnector *drc =3D SPAPR_DR_CONNECTOR(obj); - sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - return g_strdup(drck->get_name(drc)); + return g_strdup(drc->name); } =20 static void prop_get_fdt(Object *obj, Visitor *v, const char *name, @@ -653,7 +647,6 @@ static void spapr_dr_connector_class_init(ObjectClass *= k, void *data) drck->set_isolation_state =3D set_isolation_state; drck->set_indicator_state =3D set_indicator_state; drck->set_allocation_state =3D set_allocation_state; - drck->get_name =3D get_name; drck->attach =3D attach; drck->detach =3D detach; drck->release_pending =3D release_pending; @@ -848,7 +841,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Ob= ject *owner, g_array_append_val(drc_power_domains, drc_power_domain); =20 /* ibm,drc-names */ - drc_names =3D g_string_append(drc_names, drck->get_name(drc)); + drc_names =3D g_string_append(drc_names, drc->name); drc_names =3D g_string_insert_len(drc_names, -1, "\0", 1); =20 /* ibm,drc-types */ diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index f892b94..795b7dd 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -223,7 +223,6 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRIndicatorState state); uint32_t (*set_allocation_state)(sPAPRDRConnector *drc, sPAPRDRAllocationState state); - const char *(*get_name)(sPAPRDRConnector *drc); =20 /* QEMU interfaces for managing hotplug operations */ void (*attach)(sPAPRDRConnector *drc, DeviceState *d, void *fdt, --=20 2.9.4