Thomas Huth <th...@redhat.com> writes:
> On 25/02/2019 19.37, Markus Armbruster wrote:
>> The first call of sysbus_get_default() creates the main system bus and
>> stores it in QOM as "/machine/unattached/sysbus". This must not
>> happen before main() creates "/machine", or else container_get() would
>> "helpfully" create it as "container" object, and the real creation of
>> "/machine" would later abort with "attempt to add duplicate property
>> 'machine' to object (type 'container')". Has been that way ever since
>> we wired up busses in QOM (commit f968fc6892d, v1.2.0).
>>
>> I believe the bug is latent. I got it to bite by trying to
>> qdev_create() a sysbus device from a machine's .instance_init()
>> method.
>>
>> The fix is obvious: store the main system bus in QOM right after
>> creating "/machine".
>>
>> Signed-off-by: Markus Armbruster <arm...@redhat.com>
>> ---
>> hw/core/sysbus.c | 3 ---
>> vl.c | 4 ++++
>> 2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
>> index 9f9edbcab9..307cf90a51 100644
>> --- a/hw/core/sysbus.c
>> +++ b/hw/core/sysbus.c
>> @@ -357,9 +357,6 @@ static void main_system_bus_create(void)
>> qbus_create_inplace(main_system_bus, system_bus_info.instance_size,
>> TYPE_SYSTEM_BUS, NULL, "main-system-bus");
>> OBJECT(main_system_bus)->free = g_free;
>> - object_property_add_child(container_get(qdev_get_machine(),
>> - "/unattached"),
>> - "sysbus", OBJECT(main_system_bus), NULL);
>> }
>>
>> BusState *sysbus_get_default(void)
>> diff --git a/vl.c b/vl.c
>> index e3fdce410f..6ce3d2d448 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -3990,6 +3990,10 @@ int main(int argc, char **argv, char **envp)
>> }
>> object_property_add_child(object_get_root(), "machine",
>> OBJECT(current_machine), &error_abort);
>> + object_property_add_child(container_get(OBJECT(current_machine),
>> + "/unattached"),
>> + "sysbus", OBJECT(sysbus_get_default()),
>> + NULL);
>>
>> if (machine_class->minimum_page_bits) {
>> if
>> (!set_preferred_target_page_bits(machine_class->minimum_page_bits)) {
>>
>
> Looks right. Especially, a device should also not add itself to a
> parent, so this definitely should not be done in sysbus.c
>
> Reviewed-by: Thomas Huth <th...@redhat.com>
>
>
> PS: Not directly related to your patch, but in a separate patch we
> should also object_unref(current_machine) here to drop the superfluous
> second reference to current_machine after we added it as a child of the
> root object.
Just for cleanliness. Makes sense.
Thanks!
