aboutsummaryrefslogtreecommitdiff
path: root/target/i386/cpu-sysemu.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2022-11-04 17:06:57 +0100
committerMarkus Armbruster <armbru@redhat.com>2022-12-14 20:04:47 +0100
commitfe8ac1fa49a2aa2c6badf26c6fbed5720d3f61f9 (patch)
tree5443f163c625c41a011216ebf264ba14029ebac5 /target/i386/cpu-sysemu.c
parent107111bf6f8165f333ff934c5f482818572874ce (diff)
downloadqemu-fe8ac1fa49a2aa2c6badf26c6fbed5720d3f61f9.zip
qemu-fe8ac1fa49a2aa2c6badf26c6fbed5720d3f61f9.tar.gz
qemu-fe8ac1fa49a2aa2c6badf26c6fbed5720d3f61f9.tar.bz2
qapi machine: Elide redundant has_FOO in generated C
The has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/machine*.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Eduardo Habkost <eduardo@habkost.net> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Cc: Philippe Mathieu-Daudé <f4bug@amsat.org> Cc: Yanan Wang <wangyanan55@huawei.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20221104160712.3005652-16-armbru@redhat.com>
Diffstat (limited to 'target/i386/cpu-sysemu.c')
-rw-r--r--target/i386/cpu-sysemu.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c
index a6f47b7..fc97213 100644
--- a/target/i386/cpu-sysemu.c
+++ b/target/i386/cpu-sysemu.c
@@ -187,10 +187,8 @@ qmp_query_cpu_model_expansion(CpuModelExpansionType type,
QDict *props = NULL;
const char *base_name;
- xc = x86_cpu_from_model(model->name,
- model->has_props ?
- qobject_to(QDict, model->props) :
- NULL, &err);
+ xc = x86_cpu_from_model(model->name, qobject_to(QDict, model->props),
+ &err);
if (err) {
goto out;
}
@@ -198,7 +196,6 @@ qmp_query_cpu_model_expansion(CpuModelExpansionType type,
props = qdict_new();
ret->model = g_new0(CpuModelInfo, 1);
ret->model->props = QOBJECT(props);
- ret->model->has_props = true;
switch (type) {
case CPU_MODEL_EXPANSION_TYPE_STATIC: