From d5704100a478118313ce89e8725c714f20deb094 Mon Sep 17 00:00:00 2001

From: Suraj Jitindar Singh <sursingh@redhat.com>

Date: Tue, 13 Mar 2018 05:21:32 +0100

Subject: [PATCH 10/17] ppc/spapr-caps: Add support for custom

 spapr_capabilities

RH-Author: Suraj Jitindar Singh <sursingh@redhat.com>

Message-id: <1520918499-27663-5-git-send-email-sursingh@redhat.com>

Patchwork-id: 79246

O-Subject: [RHEL7.5 qemu-kvm-rhev PATCH 04/11] ppc/spapr-caps: Add support for custom spapr_capabilities

Bugzilla: 1554957

RH-Acked-by: David Gibson <dgibson@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Suraj Jitindar Singh <sjitindarsingh@gmail.com>

There are currently 2 implemented types of spapr-caps, boolean and

tristate. However there may be a need for caps which don't fit either of

these options. Add a custom capability type for which a list of custom

valid strings can be specified and implement the get/set functions for

these. Also add a field for help text to describe the available options.

Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>

[dwg: Change "help" option to "?" matching qemu conventions]

[dwg: Add ATTRIBUTE_UNUSED to avoid breaking bisect]

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

(cherry picked from commit 87175d1bc5272fff5cffb05c410b39f839dfc948)

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1548919

Signed-off-by: Suraj Jitindar Singh <sursingh@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/ppc/spapr_caps.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++

 1 file changed, 70 insertions(+)

diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c

index 99a4b71..3d8b796 100644

--- a/hw/ppc/spapr_caps.c

+++ b/hw/ppc/spapr_caps.c

@@ -32,6 +32,20 @@

 #include "hw/ppc/spapr.h"

+typedef struct sPAPRCapPossible {

+    int num;            /* size of vals array below */

+    const char *help;   /* help text for vals */

+    /*

+     * Note:

+     * - because of the way compatibility is determined vals MUST be ordered

+     *   such that later options are a superset of all preceding options.

+     * - the order of vals must be preserved, that is their index is important,

+     *   however vals may be added to the end of the list so long as the above

+     *   point is observed

+     */

+    const char *vals[];

+} sPAPRCapPossible;

+

 typedef struct sPAPRCapabilityInfo {

     const char *name;

     const char *description;

@@ -41,6 +55,8 @@ typedef struct sPAPRCapabilityInfo {

     ObjectPropertyAccessor *get;

     ObjectPropertyAccessor *set;

     const char *type;

+    /* Possible values if this is a custom string type */

+    sPAPRCapPossible *possible;

     /* Make sure the virtual hardware can support this capability */

     void (*apply)(sPAPRMachineState *spapr, uint8_t val, Error **errp);

 } sPAPRCapabilityInfo;

@@ -133,6 +149,60 @@ out:

     g_free(val);

 }

+static void ATTRIBUTE_UNUSED spapr_cap_get_string(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);

+

+    if (value >= cap->possible->num) {

+        error_setg(errp, "Invalid value (%d) for cap-%s", value, cap->name);

+        return;

+    }

+

+    val = g_strdup(cap->possible->vals[value]);

+

+    visit_type_str(v, name, &val, errp);

+    g_free(val);

+}

+

+static void ATTRIBUTE_UNUSED spapr_cap_set_string(Object *obj, Visitor *v,

+                                                  const char *name,

+                                                  void *opaque, Error **errp)

+{

+    sPAPRCapabilityInfo *cap = opaque;

+    sPAPRMachineState *spapr = SPAPR_MACHINE(obj);

+    Error *local_err = NULL;

+    uint8_t i;

+    char *val;

+

+    visit_type_str(v, name, &val, &local_err);

+    if (local_err) {

+        error_propagate(errp, local_err);

+        return;

+    }

+

+    if (!strcmp(val, "?")) {

+        error_setg(errp, "%s", cap->possible->help);

+        goto out;

+    }

+    for (i = 0; i < cap->possible->num; i++) {

+        if (!strcasecmp(val, cap->possible->vals[i])) {

+            spapr->cmd_line_caps[cap->index] = true;

+            spapr->eff.caps[cap->index] = i;

+            goto out;

+        }

+    }

+

+    error_setg(errp, "Invalid capability mode \"%s\" for cap-%s", val,

+               cap->name);

+out:

+    g_free(val);

+}

+

 static void cap_htm_apply(sPAPRMachineState *spapr, uint8_t val, Error **errp)

 {

     if (!val) {

-- 

1.8.3.1