Received: from eggs.gnu.org ([209.51.188.92]:49729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJwdl-0008BK-6F for qemu-devel@nongnu.org; Fri, 26 Apr 2019 04:55:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJwdj-0002dS-Fx for qemu-devel@nongnu.org; Fri, 26 Apr 2019 04:55:29 -0400 Received: from mga05.intel.com ([192.55.52.43]:40051) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJwdh-0002YF-Id for qemu-devel@nongnu.org; Fri, 26 Apr 2019 04:55:27 -0400 References: <20190425200051.19906-1-ehabkost@redhat.com> From: Like Xu Message-ID: <1428e157-aa6d-02fc-94c9-97e948e3654d@linux.intel.com> Date: Fri, 26 Apr 2019 16:55:17 +0800 MIME-Version: 1.0 In-Reply-To: <20190425200051.19906-1-ehabkost@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 0/4] Remove some qdev_get_machine() calls from CONFIG_USER_ONLY List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , Markus Armbruster , Paolo Bonzini On 2019/4/26 4:00, Eduardo Habkost wrote: > This series moves some qdev code outside qdev.o, so it can be > compiled only in CONFIG_SOFTMMU. > > The code being moved includes two qdev_get_machine() calls, so > this will make it easier to move qdev_get_machine() to > CONFIG_SOFTMMU later. > > After this series, there's one remaining qdev_get_machine() call > that seems more difficult to remove: > > static void device_set_realized(Object *obj, bool value, Error **errp) > { > /* [...] */ > if (!obj->parent) { > gchar *name = g_strdup_printf("device[%d]", unattached_count++); > > object_property_add_child(container_get(qdev_get_machine(), > "/unattached"), > name, obj, &error_abort); > unattached_parent = true; > g_free(name); > } > /* [...] */ > } > I may have an experimental patch to fix device_set_realized issue: 1. in qdev_get_machine(): replace dev = container_get(object_get_root(), "/machine"); with dev = object_resolve_path("/machine", NULL); 2. in device_set_realized(): Using Object *container = qdev_get_machine() ? qdev_get_machine() : object_get_root(); and pass it to object_property_add_child( container_get(container, "/unattached"), name, obj, &error_abort); With this fix, we could say the qdev_get_machine() does return the "/machine" object (or null) not a confused "/container". We could continue to use qdev_get_machine() in system emulation mode, getting rid of its surprising side effect as Markus said. The return value of qdev_get_machine() in user-only mode is the same object returned by object_get_root(), so no semantic changes. > This one is tricky because on system emulation mode it needs > "/machine" to already exist, but in user-only mode it needs to > implicitly create a "/machine" container. > > Eduardo Habkost (4): > machine: Move gpio code to hw/core/gpio.c > move qdev hotplug code to qdev-hotplug.c > qdev: Don't compile hotplug code in user-mode emulation > qdev-hotplug: Don't check type of qdev_get_machine() > > hw/core/bus.c | 11 -- > hw/core/gpio.c | 206 ++++++++++++++++++++++++++++++++ > hw/core/qdev-hotplug-stubs.c | 44 +++++++ > hw/core/qdev-hotplug.c | 64 ++++++++++ > hw/core/qdev.c | 219 ----------------------------------- > hw/core/Makefile.objs | 5 +- > tests/Makefile.include | 3 +- > 7 files changed, 320 insertions(+), 232 deletions(-) > create mode 100644 hw/core/gpio.c > create mode 100644 hw/core/qdev-hotplug-stubs.c > create mode 100644 hw/core/qdev-hotplug.c >