Greg Kurz 0b47ec4b95 cpu/core: Fix "help" of CPU core device types ... Calling qdev_get_machine() from a QOM instance_init function is fragile because we can't be sure the machine object actually exists. And this happens to break when passing ",help" on the command line to get the list of properties for a CPU core device types : $ ./qemu-system-ppc64 -device power8_v2.0-spapr-cpu-core,help qemu-system-ppc64: ../../hw/core/machine.c:1290: qdev_get_machine: Assertion `machine != NULL' failed. Aborted (core dumped) This used to work before QEMU 5.0, but commit 3df261b667 unwillingly introduced a subtle regression : the above command line needs to create an instance but the instance_init function of the base class calls qdev_get_machine() before qemu_create_machine() has been called, which is a programming bug. Use current_machine instead. It is okay to skip the setting of nr_thread in this case since only its type is displayed. Fixes: 3df261b667 ("softmmu/vl.c: Handle '-cpu help' and '-device help' before 'no default machine'") Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Greg Kurz <groug@kaod.org> Cc: peter.maydell@linaro.org Message-Id: <20210409160339.500167-3-groug@kaod.org> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>		2021-04-09 16:05:16 -04:00
..
a9mpcore.c	qom: simplify object_find_property / object_class_find_property	2020-09-22 16:45:16 -04:00
a15mpcore.c	qom: simplify object_find_property / object_class_find_property	2020-09-22 16:45:16 -04:00
arm11mpcore.c	error: Eliminate error_propagate() with Coccinelle, part 1	2020-07-10 15:18:08 +02:00
cluster.c	qdev: set properties with device_class_set_props()	2020-01-24 20:59:15 +01:00
core.c	cpu/core: Fix "help" of CPU core device types	2021-04-09 16:05:16 -04:00
Kconfig	kconfig: introduce kconfig files	2019-03-07 21:45:53 +01:00
meson.build	meson: convert hw/cpu	2020-08-21 06:30:31 -04:00
realview_mpcore.c	Use OBJECT_DECLARE_SIMPLE_TYPE when possible	2020-09-18 14:12:32 -04:00