2017-01-04 08:19:50 +03:00
|
|
|
/*
|
|
|
|
* PowerPC CPU initialization for qemu.
|
|
|
|
*
|
|
|
|
* Copyright 2016, David Gibson, Red Hat Inc. <dgibson@redhat.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
2020-10-19 09:11:26 +03:00
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
2017-01-04 08:19:50 +03:00
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "qemu/osdep.h"
|
2016-11-10 06:37:38 +03:00
|
|
|
#include "sysemu/hw_accel.h"
|
2017-01-04 08:19:50 +03:00
|
|
|
#include "sysemu/kvm.h"
|
|
|
|
#include "kvm_ppc.h"
|
|
|
|
#include "sysemu/cpus.h"
|
|
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "qapi/error.h"
|
2017-06-11 15:33:59 +03:00
|
|
|
#include "qapi/visitor.h"
|
2017-01-04 08:19:50 +03:00
|
|
|
#include "cpu-models.h"
|
|
|
|
|
|
|
|
typedef struct {
|
2017-06-11 15:33:59 +03:00
|
|
|
const char *name;
|
2017-01-04 08:19:50 +03:00
|
|
|
uint32_t pvr;
|
|
|
|
uint64_t pcr;
|
2016-10-28 14:51:46 +03:00
|
|
|
uint64_t pcr_level;
|
2018-01-15 08:40:23 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Maximum allowed virtual threads per virtual core
|
|
|
|
*
|
|
|
|
* This is to stop older guests getting confused by seeing more
|
|
|
|
* threads than they think the cpu can support. Usually it's
|
|
|
|
* equal to the number of threads supported on bare metal
|
|
|
|
* hardware, but not always (see POWER9).
|
|
|
|
*/
|
|
|
|
int max_vthreads;
|
2017-01-04 08:19:50 +03:00
|
|
|
} CompatInfo;
|
|
|
|
|
|
|
|
static const CompatInfo compat_table[] = {
|
2016-10-28 14:51:46 +03:00
|
|
|
/*
|
|
|
|
* Ordered from oldest to newest - the code relies on this
|
|
|
|
*/
|
2017-01-04 08:19:50 +03:00
|
|
|
{ /* POWER6, ISA2.05 */
|
2017-06-11 15:33:59 +03:00
|
|
|
.name = "power6",
|
2017-01-04 08:19:50 +03:00
|
|
|
.pvr = CPU_POWERPC_LOGICAL_2_05,
|
2019-12-05 21:44:50 +03:00
|
|
|
.pcr = PCR_COMPAT_3_10 | PCR_COMPAT_3_00 | PCR_COMPAT_2_07 |
|
|
|
|
PCR_COMPAT_2_06 | PCR_COMPAT_2_05 | PCR_TM_DIS | PCR_VSX_DIS,
|
2016-10-28 14:51:46 +03:00
|
|
|
.pcr_level = PCR_COMPAT_2_05,
|
2018-01-15 08:40:23 +03:00
|
|
|
.max_vthreads = 2,
|
2017-01-04 08:19:50 +03:00
|
|
|
},
|
|
|
|
{ /* POWER7, ISA2.06 */
|
2017-06-11 15:33:59 +03:00
|
|
|
.name = "power7",
|
2017-01-04 08:19:50 +03:00
|
|
|
.pvr = CPU_POWERPC_LOGICAL_2_06,
|
2019-12-05 21:44:50 +03:00
|
|
|
.pcr = PCR_COMPAT_3_10 | PCR_COMPAT_3_00 | PCR_COMPAT_2_07 |
|
|
|
|
PCR_COMPAT_2_06 | PCR_TM_DIS,
|
2016-10-28 14:51:46 +03:00
|
|
|
.pcr_level = PCR_COMPAT_2_06,
|
2018-01-15 08:40:23 +03:00
|
|
|
.max_vthreads = 4,
|
2017-01-04 08:19:50 +03:00
|
|
|
},
|
|
|
|
{
|
2017-06-11 15:33:59 +03:00
|
|
|
.name = "power7+",
|
2017-01-04 08:19:50 +03:00
|
|
|
.pvr = CPU_POWERPC_LOGICAL_2_06_PLUS,
|
2019-12-05 21:44:50 +03:00
|
|
|
.pcr = PCR_COMPAT_3_10 | PCR_COMPAT_3_00 | PCR_COMPAT_2_07 |
|
|
|
|
PCR_COMPAT_2_06 | PCR_TM_DIS,
|
2016-10-28 14:51:46 +03:00
|
|
|
.pcr_level = PCR_COMPAT_2_06,
|
2018-01-15 08:40:23 +03:00
|
|
|
.max_vthreads = 4,
|
2017-01-04 08:19:50 +03:00
|
|
|
},
|
|
|
|
{ /* POWER8, ISA2.07 */
|
2017-06-11 15:33:59 +03:00
|
|
|
.name = "power8",
|
2017-01-04 08:19:50 +03:00
|
|
|
.pvr = CPU_POWERPC_LOGICAL_2_07,
|
2019-12-05 21:44:50 +03:00
|
|
|
.pcr = PCR_COMPAT_3_10 | PCR_COMPAT_3_00 | PCR_COMPAT_2_07,
|
2016-10-28 14:51:46 +03:00
|
|
|
.pcr_level = PCR_COMPAT_2_07,
|
2018-01-15 08:40:23 +03:00
|
|
|
.max_vthreads = 8,
|
2017-01-04 08:19:50 +03:00
|
|
|
},
|
2017-03-01 10:12:57 +03:00
|
|
|
{ /* POWER9, ISA3.00 */
|
2017-06-11 15:33:59 +03:00
|
|
|
.name = "power9",
|
2017-03-01 10:12:57 +03:00
|
|
|
.pvr = CPU_POWERPC_LOGICAL_3_00,
|
2019-12-05 21:44:50 +03:00
|
|
|
.pcr = PCR_COMPAT_3_10 | PCR_COMPAT_3_00,
|
2017-03-01 10:12:57 +03:00
|
|
|
.pcr_level = PCR_COMPAT_3_00,
|
2018-01-14 22:23:48 +03:00
|
|
|
/*
|
|
|
|
* POWER9 hardware only supports 4 threads / core, but this
|
|
|
|
* limit is for guests. We need to support 8 vthreads/vcore
|
|
|
|
* on POWER9 for POWER8 compatibility guests, and it's very
|
|
|
|
* confusing if half of the threads disappear from the guest
|
|
|
|
* if it announces it's POWER9 aware at CAS time.
|
|
|
|
*/
|
2018-01-15 08:40:23 +03:00
|
|
|
.max_vthreads = 8,
|
2017-03-01 10:12:57 +03:00
|
|
|
},
|
2019-12-05 21:44:50 +03:00
|
|
|
{ /* POWER10, ISA3.10 */
|
|
|
|
.name = "power10",
|
|
|
|
.pvr = CPU_POWERPC_LOGICAL_3_10,
|
|
|
|
.pcr = PCR_COMPAT_3_10,
|
|
|
|
.pcr_level = PCR_COMPAT_3_10,
|
|
|
|
.max_vthreads = 8,
|
|
|
|
},
|
2024-07-31 08:50:21 +03:00
|
|
|
{ /* POWER11, ISA3.10 */
|
|
|
|
.name = "power11",
|
|
|
|
.pvr = CPU_POWERPC_LOGICAL_3_10_P11,
|
|
|
|
.pcr = PCR_COMPAT_3_10,
|
|
|
|
.pcr_level = PCR_COMPAT_3_10,
|
|
|
|
.max_vthreads = 8,
|
|
|
|
},
|
2017-01-04 08:19:50 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static const CompatInfo *compat_by_pvr(uint32_t pvr)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(compat_table); i++) {
|
|
|
|
if (compat_table[i].pvr == pvr) {
|
|
|
|
return &compat_table[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-06-14 09:33:58 +03:00
|
|
|
static bool pcc_compat(PowerPCCPUClass *pcc, uint32_t compat_pvr,
|
|
|
|
uint32_t min_compat_pvr, uint32_t max_compat_pvr)
|
2016-10-28 14:51:46 +03:00
|
|
|
{
|
|
|
|
const CompatInfo *compat = compat_by_pvr(compat_pvr);
|
|
|
|
const CompatInfo *min = compat_by_pvr(min_compat_pvr);
|
|
|
|
const CompatInfo *max = compat_by_pvr(max_compat_pvr);
|
|
|
|
|
|
|
|
g_assert(!min_compat_pvr || min);
|
|
|
|
g_assert(!max_compat_pvr || max);
|
|
|
|
|
|
|
|
if (!compat) {
|
|
|
|
/* Not a recognized logical PVR */
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if ((min && (compat < min)) || (max && (compat > max))) {
|
|
|
|
/* Outside specified range */
|
|
|
|
return false;
|
|
|
|
}
|
2024-07-31 08:50:20 +03:00
|
|
|
if (compat->pvr > pcc->spapr_logical_pvr) {
|
|
|
|
/* Older CPU cannot support a newer processor's compat mode */
|
|
|
|
return false;
|
|
|
|
}
|
2016-10-28 14:51:46 +03:00
|
|
|
if (!(pcc->pcr_supported & compat->pcr_level)) {
|
|
|
|
/* Not supported by this CPU */
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-06-14 09:33:58 +03:00
|
|
|
bool ppc_check_compat(PowerPCCPU *cpu, uint32_t compat_pvr,
|
|
|
|
uint32_t min_compat_pvr, uint32_t max_compat_pvr)
|
|
|
|
{
|
|
|
|
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
|
|
|
|
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
g_assert(cpu->vhyp);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return pcc_compat(pcc, compat_pvr, min_compat_pvr, max_compat_pvr);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr,
|
|
|
|
uint32_t min_compat_pvr, uint32_t max_compat_pvr)
|
|
|
|
{
|
|
|
|
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(object_class_by_name(cputype));
|
|
|
|
return pcc_compat(pcc, compat_pvr, min_compat_pvr, max_compat_pvr);
|
|
|
|
}
|
|
|
|
|
2020-09-14 15:34:52 +03:00
|
|
|
int ppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr, Error **errp)
|
2017-01-04 08:19:50 +03:00
|
|
|
{
|
|
|
|
const CompatInfo *compat = compat_by_pvr(compat_pvr);
|
|
|
|
CPUPPCState *env = &cpu->env;
|
|
|
|
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
|
|
|
|
uint64_t pcr;
|
|
|
|
|
|
|
|
if (!compat_pvr) {
|
|
|
|
pcr = 0;
|
|
|
|
} else if (!compat) {
|
|
|
|
error_setg(errp, "Unknown compatibility PVR 0x%08"PRIx32, compat_pvr);
|
2020-09-14 15:34:52 +03:00
|
|
|
return -EINVAL;
|
2016-10-28 14:51:46 +03:00
|
|
|
} else if (!ppc_check_compat(cpu, compat_pvr, 0, 0)) {
|
|
|
|
error_setg(errp, "Compatibility PVR 0x%08"PRIx32" not valid for CPU",
|
|
|
|
compat_pvr);
|
2020-09-14 15:34:52 +03:00
|
|
|
return -EINVAL;
|
2017-01-04 08:19:50 +03:00
|
|
|
} else {
|
|
|
|
pcr = compat->pcr;
|
|
|
|
}
|
|
|
|
|
2016-11-10 06:37:38 +03:00
|
|
|
cpu_synchronize_state(CPU(cpu));
|
|
|
|
|
2017-08-14 20:49:16 +03:00
|
|
|
if (kvm_enabled() && cpu->compat_pvr != compat_pvr) {
|
2017-10-17 22:49:14 +03:00
|
|
|
int ret = kvmppc_set_compat(cpu, compat_pvr);
|
2017-01-04 08:19:50 +03:00
|
|
|
if (ret < 0) {
|
|
|
|
error_setg_errno(errp, -ret,
|
|
|
|
"Unable to set CPU compatibility mode in KVM");
|
2020-09-14 15:34:52 +03:00
|
|
|
return ret;
|
2017-01-04 08:19:50 +03:00
|
|
|
}
|
|
|
|
}
|
2017-08-14 20:49:16 +03:00
|
|
|
|
|
|
|
cpu->compat_pvr = compat_pvr;
|
|
|
|
env->spr[SPR_PCR] = pcr & pcc->pcr_mask;
|
2020-09-14 15:34:52 +03:00
|
|
|
return 0;
|
2017-01-04 08:19:50 +03:00
|
|
|
}
|
2016-10-28 14:35:48 +03:00
|
|
|
|
2016-11-10 06:37:38 +03:00
|
|
|
typedef struct {
|
|
|
|
uint32_t compat_pvr;
|
2020-09-14 15:34:52 +03:00
|
|
|
Error **errp;
|
|
|
|
int ret;
|
2016-11-10 06:37:38 +03:00
|
|
|
} SetCompatState;
|
|
|
|
|
|
|
|
static void do_set_compat(CPUState *cs, run_on_cpu_data arg)
|
|
|
|
{
|
|
|
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
|
|
SetCompatState *s = arg.host_ptr;
|
|
|
|
|
2020-09-14 15:34:52 +03:00
|
|
|
s->ret = ppc_set_compat(cpu, s->compat_pvr, s->errp);
|
2016-11-10 06:37:38 +03:00
|
|
|
}
|
|
|
|
|
2020-09-14 15:34:52 +03:00
|
|
|
int ppc_set_compat_all(uint32_t compat_pvr, Error **errp)
|
2016-11-10 06:37:38 +03:00
|
|
|
{
|
|
|
|
CPUState *cs;
|
|
|
|
|
|
|
|
CPU_FOREACH(cs) {
|
|
|
|
SetCompatState s = {
|
|
|
|
.compat_pvr = compat_pvr,
|
2020-09-14 15:34:52 +03:00
|
|
|
.errp = errp,
|
|
|
|
.ret = 0,
|
2016-11-10 06:37:38 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
run_on_cpu(cs, do_set_compat, RUN_ON_CPU_HOST_PTR(&s));
|
|
|
|
|
2020-09-14 15:34:52 +03:00
|
|
|
if (s.ret < 0) {
|
|
|
|
return s.ret;
|
2016-11-10 06:37:38 +03:00
|
|
|
}
|
|
|
|
}
|
2020-09-14 15:34:52 +03:00
|
|
|
|
|
|
|
return 0;
|
2016-11-10 06:37:38 +03:00
|
|
|
}
|
|
|
|
|
2023-08-08 07:19:57 +03:00
|
|
|
/* To be used when the machine is not running */
|
|
|
|
int ppc_init_compat_all(uint32_t compat_pvr, Error **errp)
|
|
|
|
{
|
|
|
|
CPUState *cs;
|
|
|
|
|
|
|
|
CPU_FOREACH(cs) {
|
|
|
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = ppc_set_compat(cpu, compat_pvr, errp);
|
|
|
|
|
|
|
|
if (ret < 0) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-15 08:40:23 +03:00
|
|
|
int ppc_compat_max_vthreads(PowerPCCPU *cpu)
|
2016-10-28 14:35:48 +03:00
|
|
|
{
|
|
|
|
const CompatInfo *compat = compat_by_pvr(cpu->compat_pvr);
|
|
|
|
int n_threads = CPU(cpu)->nr_threads;
|
|
|
|
|
|
|
|
if (cpu->compat_pvr) {
|
|
|
|
g_assert(compat);
|
2018-01-15 08:40:23 +03:00
|
|
|
n_threads = MIN(n_threads, compat->max_vthreads);
|
2016-10-28 14:35:48 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return n_threads;
|
|
|
|
}
|
2017-06-11 15:33:59 +03:00
|
|
|
|
|
|
|
static void ppc_compat_prop_get(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
uint32_t compat_pvr = *((uint32_t *)opaque);
|
|
|
|
const char *value;
|
|
|
|
|
|
|
|
if (!compat_pvr) {
|
|
|
|
value = "";
|
|
|
|
} else {
|
|
|
|
const CompatInfo *compat = compat_by_pvr(compat_pvr);
|
|
|
|
|
|
|
|
g_assert(compat);
|
|
|
|
|
|
|
|
value = compat->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
visit_type_str(v, name, (char **)&value, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ppc_compat_prop_set(Object *obj, Visitor *v, const char *name,
|
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
uint32_t compat_pvr;
|
|
|
|
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!visit_type_str(v, name, &value, errp)) {
|
2017-06-11 15:33:59 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strcmp(value, "") == 0) {
|
|
|
|
compat_pvr = 0;
|
|
|
|
} else {
|
|
|
|
int i;
|
|
|
|
const CompatInfo *compat = NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(compat_table); i++) {
|
|
|
|
if (strcmp(value, compat_table[i].name) == 0) {
|
|
|
|
compat = &compat_table[i];
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!compat) {
|
|
|
|
error_setg(errp, "Invalid compatibility mode \"%s\"", value);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
compat_pvr = compat->pvr;
|
|
|
|
}
|
|
|
|
|
|
|
|
*((uint32_t *)opaque) = compat_pvr;
|
|
|
|
|
|
|
|
out:
|
|
|
|
g_free(value);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ppc_compat_add_property(Object *obj, const char *name,
|
2020-05-05 18:29:23 +03:00
|
|
|
uint32_t *compat_pvr, const char *basedesc)
|
2017-06-11 15:33:59 +03:00
|
|
|
{
|
|
|
|
gchar *namesv[ARRAY_SIZE(compat_table) + 1];
|
|
|
|
gchar *names, *desc;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
object_property_add(obj, name, "string",
|
|
|
|
ppc_compat_prop_get, ppc_compat_prop_set, NULL,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
compat_pvr);
|
2017-06-11 15:33:59 +03:00
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(compat_table); i++) {
|
|
|
|
/*
|
|
|
|
* Have to discard const here, because g_strjoinv() takes
|
|
|
|
* (gchar **), not (const gchar **) :(
|
|
|
|
*/
|
|
|
|
namesv[i] = (gchar *)compat_table[i].name;
|
|
|
|
}
|
|
|
|
namesv[ARRAY_SIZE(compat_table)] = NULL;
|
|
|
|
|
|
|
|
names = g_strjoinv(", ", namesv);
|
|
|
|
desc = g_strdup_printf("%s. Valid values are %s.", basedesc, names);
|
2020-05-05 18:29:15 +03:00
|
|
|
object_property_set_description(obj, name, desc);
|
2017-06-11 15:33:59 +03:00
|
|
|
|
|
|
|
g_free(names);
|
|
|
|
g_free(desc);
|
|
|
|
}
|