On 1/23/21 7:10 PM, Paolo Bonzini wrote: > On 22/01/21 21:44, Philippe Mathieu-Daudé wrote: >> Beside a CPU device, user-mode emulation doesn't access >> anything else from qdev subsystem. >> >> Tools don't need anything from qdev. > > I prefer to avoid stubs. So if this patch can simply be dropped with no > effects on 10-12, that's nicer for me.
The alternative is ugly: -- >8 -- diff --git a/hw/core/qdev.c b/hw/core/qdev.c index cefc5eaa0a9..d09f32e38d6 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -950,7 +950,9 @@ static void device_finalize(Object *obj) if (dev->pending_deleted_event) { g_assert(dev->canonical_path); +#ifdef CONFIG_USER_ONLY qapi_event_send_device_deleted(!!dev->id, dev->id, dev->canonical_path); +#endif g_free(dev->canonical_path); dev->canonical_path = NULL; } --- Maybe wrapping it in an inlined function?