All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	qemu-block@nongnu.org,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Zhenwei Pi" <pizhenwei@bytedance.com>,
	"Fam Zheng" <fam@euphon.net>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Peter Xu" <peterx@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Gonglei (Arei)" <arei.gonglei@huawei.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v3 04/10] qdev: Make qdev_get_machine() not use container_get()
Date: Thu,  2 Jan 2025 16:12:38 +0100	[thread overview]
Message-ID: <20250102151244.59357-5-philmd@linaro.org> (raw)
In-Reply-To: <20250102151244.59357-1-philmd@linaro.org>

From: Peter Xu <peterx@redhat.com>

Currently, qdev_get_machine() has a slight misuse on container_get(), as
the helper says "get a container" but in reality the goal is to get the
machine object.  It is still a "container" but not strictly.

Note that it _may_ get a container (at "/machine") in our current unit test
of test-qdev-global-props.c before all these changes, but it's probably
unexpected and worked by accident.

Switch to an explicit object_resolve_path_component(), with a side benefit
that qdev_get_machine() can happen a lot, and we don't need to split the
string ("/machine") every time.  This also paves way for making the helper
container_get() never try to return a non-container at all.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20241121192202.4155849-9-peterx@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/core/qdev.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 57c1d9df3a7..bc5b60212a7 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -818,7 +818,12 @@ Object *qdev_get_machine(void)
     static Object *dev;
 
     if (dev == NULL) {
-        dev = container_get(object_get_root(), "/machine");
+        dev = object_resolve_path_component(object_get_root(), "machine");
+        /*
+         * Any call to this function before machine is created is treated
+         * as a programming error as of now.
+         */
+        assert(dev);
     }
 
     return dev;
-- 
2.47.1



  parent reply	other threads:[~2025-01-02 15:14 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-02 15:12 [PATCH v3 00/10] QOM: container_get() removal Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 01/10] qdev: Expose qemu_create_machine() Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 02/10] qdev: Implement qemu_create_machine() for user emulation Philippe Mathieu-Daudé
2025-01-02 15:17   ` Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 03/10] qdev: Call qemu_create_machine() on " Philippe Mathieu-Daudé
2025-01-02 15:12 ` Philippe Mathieu-Daudé [this message]
2025-01-02 15:12 ` [PATCH v3 05/10] qdev: Add machine_get_container() Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 06/10] qdev: Use machine_get_container() Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 07/10] qom: Add object_get_container() Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 08/10] qom: Use object_get_container() Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 09/10] qom: Remove container_get() Philippe Mathieu-Daudé
2025-01-02 15:12 ` [PATCH v3 10/10] qdev: Inline machine_containers[] in qemu_create_machine_containers() Philippe Mathieu-Daudé
2025-01-02 17:29 ` [PATCH v3 00/10] QOM: container_get() removal Peter Xu
2025-01-02 21:14   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250102151244.59357-5-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=arei.gonglei@huawei.com \
    --cc=berrange@redhat.com \
    --cc=david@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=fam@euphon.net \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=pizhenwei@bytedance.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.