From f224d35be9fb971bf64b569b99ce2a582156bbf2 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 7 Jun 2017 11:26:52 +1000 Subject: spapr: Clean up DR entity sense handling DRC classes have an entity_sense method to determine (in a specific PAPR sense) the presence or absence of a device plugged into a DRC. However, we only have one implementation of the method, which explicitly tests for different DRC types. This changes it to instead have different method implementations for the two cases: "logical" and "physical" DRCs. While we're at it, the entity sense method always returns RTAS_OUT_SUCCESS, and the interesting value is returned via pass-by-reference. Simplify this to directly return the value we care about Signed-off-by: David Gibson Reviewed-by: Michael Roth Acked-by: Michael Roth --- include/hw/ppc/spapr_drc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index c88e1beed4..f892b94156 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -214,6 +214,8 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRConnectorTypeShift typeshift; const char *typename; /* used in device tree, PAPR 13.5.2.6 & C.6.1 */ + sPAPRDREntitySense (*dr_entity_sense)(sPAPRDRConnector *drc); + /* accessors for guest-visible (generally via RTAS) DR state */ uint32_t (*set_isolation_state)(sPAPRDRConnector *drc, sPAPRDRIsolationState state); @@ -223,8 +225,6 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRAllocationState state); const char *(*get_name)(sPAPRDRConnector *drc); - uint32_t (*entity_sense)(sPAPRDRConnector *drc, sPAPRDREntitySense *state); - /* QEMU interfaces for managing hotplug operations */ void (*attach)(sPAPRDRConnector *drc, DeviceState *d, void *fdt, int fdt_start_offset, bool coldplug, Error **errp); -- cgit v1.2.3