On Fri, 9 Apr 2021 16:14:41 -0400 Eduardo Habkost <ehabk...@redhat.com> wrote:
> On Fri, Apr 09, 2021 at 06:03:38PM +0200, Greg Kurz wrote: > [...] > > In order to avoid further subtle breakages like this, change the > > implentation of qdev_get_machine() to: > > - keep the existing behaviour of creating the dummy "container" > > object for the user-mode case only ; > > - abort() if the machine doesn't exist yet in the QOM tree for > > the system-mode case. This gives a precise hint to developpers > > that calling qdev_get_machine() too early is a programming bug. > > > > This is achieved with a new do_qdev_get_machine() function called > > from qdev_get_machine(), with different implementations for system > > and user mode. > > > > $ ./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) > > Should this to be considered for 6.0? It doesn't seem to be a > bug fix, but just a preventive measure. > Correct. I forgot to add a for-6.1 prefix but it is definitely too late for 6.0.