openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap 

Convert cap-cfpc (cache flush on privilege change) to a custom spapr-cap
type.

Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
[dwg: Don't explicitly list "?"/help option, trusting convention]
[dwg: Strip no-longer-necessary ATTRIBUTE_UNUSED back off]
[dwg: Fix some minor style problems]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Suraj Jitindar Singh 2018-03-01 17:38:00 +11:00 committed by David Gibson
parent 87175d1bc5
commit f27aa81e72
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/ppc/spapr_caps.c
View File

@ -149,9 +149,8 @@ out:
g_free(val); g_free(val);
} }
static void ATTRIBUTE_UNUSED spapr_cap_get_string(Object *obj, Visitor *v, static void spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
const char *name, void *opaque, Error **errp)
void *opaque, Error **errp)
{ {
sPAPRCapabilityInfo *cap = opaque; sPAPRCapabilityInfo *cap = opaque;
sPAPRMachineState *spapr = SPAPR_MACHINE(obj); sPAPRMachineState *spapr = SPAPR_MACHINE(obj);
@ -169,9 +168,8 @@ static void ATTRIBUTE_UNUSED spapr_cap_get_string(Object *obj, Visitor *v,
g_free(val); g_free(val);
} }
static void ATTRIBUTE_UNUSED spapr_cap_set_string(Object *obj, Visitor *v, static void spapr_cap_set_string(Object *obj, Visitor *v, const char *name,
const char *name, void *opaque, Error **errp)
void *opaque, Error **errp)
{ {
sPAPRCapabilityInfo *cap = opaque; sPAPRCapabilityInfo *cap = opaque;
sPAPRMachineState *spapr = SPAPR_MACHINE(obj); sPAPRMachineState *spapr = SPAPR_MACHINE(obj);
@ -250,14 +248,26 @@ static void cap_dfp_apply(sPAPRMachineState *spapr, uint8_t val, Error **errp)
} }
} }
sPAPRCapPossible cap_cfpc_possible = {
.num = 3,
.vals = {"broken", "workaround", "fixed"},
.help = "broken - no protection, workaround - workaround available,"
" fixed - fixed in hardware",
};
static void cap_safe_cache_apply(sPAPRMachineState *spapr, uint8_t val, static void cap_safe_cache_apply(sPAPRMachineState *spapr, uint8_t val,
Error **errp) Error **errp)
{ {
uint8_t kvm_val = kvmppc_get_cap_safe_cache();
if (tcg_enabled() && val) { if (tcg_enabled() && val) {
/* TODO - for now only allow broken for TCG */ /* TODO - for now only allow broken for TCG */
error_setg(errp, "Requested safe cache capability level not supported by tcg, try a different value for cap-cfpc"); error_setg(errp,
} else if (kvm_enabled() && (val > kvmppc_get_cap_safe_cache())) { "Requested safe cache capability level not supported by tcg, try a different value for cap-cfpc");
error_setg(errp, "Requested safe cache capability level not supported by kvm, try a different value for cap-cfpc"); } else if (kvm_enabled() && (val > kvm_val)) {
error_setg(errp,
"Requested safe cache capability level not supported by kvm, try cap-cfpc=%s",
cap_cfpc_possible.vals[kvm_val]);
} }
} }
@ -319,9 +329,10 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
.name = "cfpc", .name = "cfpc",
.description = "Cache Flush on Privilege Change" VALUE_DESC_TRISTATE, .description = "Cache Flush on Privilege Change" VALUE_DESC_TRISTATE,
.index = SPAPR_CAP_CFPC, .index = SPAPR_CAP_CFPC,
.get = spapr_cap_get_tristate, .get = spapr_cap_get_string,
.set = spapr_cap_set_tristate, .set = spapr_cap_set_string,
.type = "string", .type = "string",
.possible = &cap_cfpc_possible,
.apply = cap_safe_cache_apply, .apply = cap_safe_cache_apply,
}, },
[SPAPR_CAP_SBBC] = { [SPAPR_CAP_SBBC] = {