On Mon, Jan 15, 2018 at 05:32:31PM +1100, Suraj Jitindar Singh wrote: > spapr_caps are used to represent the level of support for various > capabilities related to the spapr machine type. Currently there is > only support for boolean capabilities. > > Add support for tristate capabilities by implementing their get/set > functions. These capabilities can have the values 0, 1 or 2 > corresponding to broken, workaround and fixed. > > Signed-off-by: Suraj Jitindar Singh <sjitindarsi...@gmail.com>
Applied to ppc-for-2.12.
> ---
> hw/ppc/spapr_caps.c | 60
> ++++++++++++++++++++++++++++++++++++++++++++++++++
> include/hw/ppc/spapr.h | 4 ++++
> 2 files changed, 64 insertions(+)
>
> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
> index d5c9ce774a..436250d77b 100644
> --- a/hw/ppc/spapr_caps.c
> +++ b/hw/ppc/spapr_caps.c
> @@ -73,6 +73,66 @@ static void spapr_cap_set_bool(Object *obj, Visitor *v,
> const char *name,
> spapr->eff.caps[cap->index] = value ? SPAPR_CAP_ON : SPAPR_CAP_OFF;
> }
>
> +static void spapr_cap_get_tristate(Object *obj, Visitor *v, const char *name,
> + void *opaque, Error **errp)
> +{
> + sPAPRCapabilityInfo *cap = opaque;
> + sPAPRMachineState *spapr = SPAPR_MACHINE(obj);
> + char *val = NULL;
> + uint8_t value = spapr_get_cap(spapr, cap->index);
> +
> + switch (value) {
> + case SPAPR_CAP_BROKEN:
> + val = g_strdup("broken");
> + break;
> + case SPAPR_CAP_WORKAROUND:
> + val = g_strdup("workaround");
> + break;
> + case SPAPR_CAP_FIXED:
> + val = g_strdup("fixed");
> + break;
> + default:
> + error_setg(errp, "Invalid value (%d) for cap-%s", value, cap->name);
> + return;
> + }
> +
> + visit_type_str(v, name, &val, errp);
> + g_free(val);
> +}
> +
> +static void spapr_cap_set_tristate(Object *obj, Visitor *v, const char *name,
> + void *opaque, Error **errp)
> +{
> + sPAPRCapabilityInfo *cap = opaque;
> + sPAPRMachineState *spapr = SPAPR_MACHINE(obj);
> + char *val;
> + Error *local_err = NULL;
> + uint8_t value;
> +
> + visit_type_str(v, name, &val, &local_err);
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> + }
> +
> + if (!strcasecmp(val, "broken")) {
> + value = SPAPR_CAP_BROKEN;
> + } else if (!strcasecmp(val, "workaround")) {
> + value = SPAPR_CAP_WORKAROUND;
> + } else if (!strcasecmp(val, "fixed")) {
> + value = SPAPR_CAP_FIXED;
> + } else {
> + error_setg(errp, "Invalid capability mode \"%s\" for cap-%s", val,
> + cap->name);
> + goto out;
> + }
> +
> + spapr->cmd_line_caps[cap->index] = true;
> + spapr->eff.caps[cap->index] = value;
> +out:
> + g_free(val);
> +}
> +
> static void cap_htm_apply(sPAPRMachineState *spapr, uint8_t val, Error
> **errp)
> {
> if (!val) {
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index eded0ea57d..61bb3632c4 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -69,6 +69,10 @@ typedef enum {
> /* Bool Caps */
> #define SPAPR_CAP_OFF 0x00
> #define SPAPR_CAP_ON 0x01
> +/* Broken | Workaround | Fixed Caps */
> +#define SPAPR_CAP_BROKEN 0x00
> +#define SPAPR_CAP_WORKAROUND 0x01
> +#define SPAPR_CAP_FIXED 0x02
>
> typedef struct sPAPRCapabilities sPAPRCapabilities;
> struct sPAPRCapabilities {
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
