From 798083361950ec3fed946bbcf22c924ef820e45e Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 7 Jun 2017 12:00:11 +1000 Subject: spapr: Rework DRC name handling DRC objects have a get_name method which returns the DRC name generated when the DRC is created. Replace that with a fixed spapr_drc_name() function which generates the name on the fly from other information. This means: * We get rid of a method with only one implementation, and only local callers * We don't have to carry the name string around for the lifetime of the DRC * We use information added to the class structure to generate the name in standard format, so we don't need an explicit switch on drc type any more We also eliminate the 'name' property; it's basically useless since the only information in it can easily be deduced from other things. Signed-off-by: David Gibson Reviewed-by: Michael Roth Acked-by: Michael Roth --- include/hw/ppc/spapr_drc.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 4f82001109..c487123c59 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -184,7 +184,6 @@ typedef struct sPAPRDRConnector { uint32_t id; Object *owner; - const char *name; /* DR-indicator */ uint32_t dr_indicator; @@ -215,6 +214,7 @@ typedef struct sPAPRDRConnectorClass { /*< public >*/ sPAPRDRConnectorTypeShift typeshift; const char *typename; /* used in device tree, PAPR 13.5.2.6 & C.6.1 */ + const char *drc_name_prefix; /* used other places in device tree */ sPAPRDREntitySense (*dr_entity_sense)(sPAPRDRConnector *drc); @@ -223,7 +223,6 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRIsolationState state); uint32_t (*set_allocation_state)(sPAPRDRConnector *drc, sPAPRDRAllocationState state); - const char *(*get_name)(sPAPRDRConnector *drc); /* QEMU interfaces for managing hotplug operations */ bool (*release_pending)(sPAPRDRConnector *drc); -- cgit v1.2.3