From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbIm4-0007nh-Bq for qemu-devel@nongnu.org; Sun, 13 Sep 2015 21:41:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbIm0-0001oF-AW for qemu-devel@nongnu.org; Sun, 13 Sep 2015 21:41:40 -0400 From: David Gibson Date: Mon, 14 Sep 2015 11:41:52 +1000 Message-Id: <1442194913-26545-2-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1442194913-26545-1-git-send-email-david@gibson.dropbear.id.au> References: <1442194913-26545-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [RFCv2 1/2] spapr: Remove unnecessary owner field from sPAPRDRConnector List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mdroth@linux.vnet.ibm.com, bharata@linux.vnet.ibm.com, aik@ozlabs.ru Cc: pbonzini@redhat.com, David Gibson , qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org The sPAPRDRConnector pseudo-device contains an owner field which is set in spapr_dr_connector_new(). However, that function also calls object_property_add_child() to set the DRConnector as the QOM child of the owner object. That means that owner is always the same as the QOM parent, and so redundant. Signed-off-by: David Gibson --- hw/ppc/spapr_drc.c | 5 ++--- include/hw/ppc/spapr_drc.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 9ce844a..68e0c3e 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -416,7 +416,7 @@ static void realize(DeviceState *d, Error **errp) child_name = object_get_canonical_path_component(OBJECT(drc)); DPRINTFN("drc child name: %s", child_name); object_property_add_alias(root_container, link_name, - drc->owner, child_name, &err); + OBJECT(drc)->parent, child_name, &err); if (err) { error_report("%s", error_get_pretty(err)); error_free(err); @@ -456,7 +456,6 @@ sPAPRDRConnector *spapr_dr_connector_new(Object *owner, drc->type = type; drc->id = id; - drc->owner = owner; object_property_add_child(owner, "dr-connector[*]", OBJECT(drc), NULL); object_property_set_bool(OBJECT(drc), true, "realized", NULL); @@ -669,7 +668,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, drc = SPAPR_DR_CONNECTOR(obj); drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); - if (owner && (drc->owner != owner)) { + if (owner && (OBJECT(drc)->parent != owner)) { continue; } diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 28ffeae..16e2d4b 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -137,7 +137,6 @@ typedef struct sPAPRDRConnector { sPAPRDRConnectorType type; uint32_t id; - Object *owner; const char *name; /* sensor/indicator states */ -- 2.4.3