|
 |
4a2fec |
From 146d96d35b69fea9311b15de60eb85a076ec2e14 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Date: Fri, 19 Jan 2018 02:34:42 +0100
|
|
|
4a2fec |
Subject: [PATCH 14/21] spapr: Remove unnecessary 'options' field from
|
|
|
4a2fec |
sPAPRCapabilityInfo
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Message-id: <20180119023442.28577-8-dgibson@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78673
|
|
|
4a2fec |
O-Subject: [RHEL-7.5 qemu-kvm-rhev PATCH 7/7] spapr: Remove unnecessary 'options' field from sPAPRCapabilityInfo
|
|
|
4a2fec |
Bugzilla: 1523414
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: David Gibson <david@gibson.dropbear.id.au>
|
|
|
4a2fec |
|
|
|
4a2fec |
The options field here is intended to list the available values for the
|
|
|
4a2fec |
capability. It's not used yet, because the existing capabilities are
|
|
|
4a2fec |
boolean.
|
|
|
4a2fec |
|
|
|
4a2fec |
We're going to add capabilities that aren't, but in that case the info on
|
|
|
4a2fec |
the possible values can be folded into the .description field.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
4a2fec |
(cherry picked from commit 895d5cd620d358c2623c639a150d9320d581b4f8)
|
|
|
4a2fec |
|
|
|
4a2fec |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1523414
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/ppc/spapr_caps.c | 6 +-----
|
|
|
4a2fec |
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
|
|
|
4a2fec |
index f95a785..d5c9ce7 100644
|
|
|
4a2fec |
--- a/hw/ppc/spapr_caps.c
|
|
|
4a2fec |
+++ b/hw/ppc/spapr_caps.c
|
|
|
4a2fec |
@@ -35,7 +35,6 @@
|
|
|
4a2fec |
typedef struct sPAPRCapabilityInfo {
|
|
|
4a2fec |
const char *name;
|
|
|
4a2fec |
const char *description;
|
|
|
4a2fec |
- const char *options; /* valid capability values */
|
|
|
4a2fec |
int index;
|
|
|
4a2fec |
|
|
|
4a2fec |
/* Getter and Setter Function Pointers */
|
|
|
4a2fec |
@@ -126,7 +125,6 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
|
|
|
4a2fec |
[SPAPR_CAP_HTM] = {
|
|
|
4a2fec |
.name = "htm",
|
|
|
4a2fec |
.description = "Allow Hardware Transactional Memory (HTM)",
|
|
|
4a2fec |
- .options = "",
|
|
|
4a2fec |
.index = SPAPR_CAP_HTM,
|
|
|
4a2fec |
.get = spapr_cap_get_bool,
|
|
|
4a2fec |
.set = spapr_cap_set_bool,
|
|
|
4a2fec |
@@ -136,7 +134,6 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
|
|
|
4a2fec |
[SPAPR_CAP_VSX] = {
|
|
|
4a2fec |
.name = "vsx",
|
|
|
4a2fec |
.description = "Allow Vector Scalar Extensions (VSX)",
|
|
|
4a2fec |
- .options = "",
|
|
|
4a2fec |
.index = SPAPR_CAP_VSX,
|
|
|
4a2fec |
.get = spapr_cap_get_bool,
|
|
|
4a2fec |
.set = spapr_cap_set_bool,
|
|
|
4a2fec |
@@ -146,7 +143,6 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
|
|
|
4a2fec |
[SPAPR_CAP_DFP] = {
|
|
|
4a2fec |
.name = "dfp",
|
|
|
4a2fec |
.description = "Allow Decimal Floating Point (DFP)",
|
|
|
4a2fec |
- .options = "",
|
|
|
4a2fec |
.index = SPAPR_CAP_DFP,
|
|
|
4a2fec |
.get = spapr_cap_get_bool,
|
|
|
4a2fec |
.set = spapr_cap_set_bool,
|
|
|
4a2fec |
@@ -338,7 +334,7 @@ void spapr_caps_add_properties(sPAPRMachineClass *smc, Error **errp)
|
|
|
4a2fec |
return;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
- desc = g_strdup_printf("%s%s", cap->description, cap->options);
|
|
|
4a2fec |
+ desc = g_strdup_printf("%s", cap->description);
|
|
|
4a2fec |
object_class_property_set_description(klass, name, desc, &local_err);
|
|
|
4a2fec |
g_free(desc);
|
|
|
4a2fec |
if (local_err) {
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|