motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/ppc: Explicitly create the drc container

Browse source 
QEMU will start to not rely on implicit creations of containers soon.  Make
PPC drc devices follow by explicitly create the container whenever a drc
device is realized, dropping container_get() calls.

No functional change intended.

Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Daniel Henrique Barboza <danielhb413@gmail.com>
Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20241121192202.4155849-7-peterx@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Peter Xu 2024-11-21 14:21:55 -05:00 • committed by Philippe Mathieu-Daudé
parent 6de3c4917f
commit 7c03a17c8d
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
hw/ppc/spapr_drc.c
View file

@ -27,7 +27,7 @@
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "trace.h" #include "trace.h"
#define DRC_CONTAINER_PATH "/dr-connector" #define DRC_CONTAINER_PATH "dr-connector"
#define DRC_INDEX_TYPE_SHIFT 28 #define DRC_INDEX_TYPE_SHIFT 28
#define DRC_INDEX_ID_MASK ((1ULL << DRC_INDEX_TYPE_SHIFT) - 1) #define DRC_INDEX_ID_MASK ((1ULL << DRC_INDEX_TYPE_SHIFT) - 1)
@ -514,6 +514,16 @@ static const VMStateDescription vmstate_spapr_drc = {
} }
}; };
static void drc_container_create(void)
{
object_property_add_new_container(object_get_root(), DRC_CONTAINER_PATH);
}
static Object *drc_container_get(void)
{
return object_resolve_path_component(object_get_root(), DRC_CONTAINER_PATH);
}
static void drc_realize(DeviceState *d, Error **errp) static void drc_realize(DeviceState *d, Error **errp)
{ {
SpaprDrc *drc = SPAPR_DR_CONNECTOR(d); SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
@ -529,7 +539,7 @@ static void drc_realize(DeviceState *d, Error **errp)
* inaccessible by the guest, since lookups rely on this path * inaccessible by the guest, since lookups rely on this path
* existing in the composition tree * existing in the composition tree
*/ */
root_container = container_get(object_get_root(), DRC_CONTAINER_PATH); root_container = drc_container_get();
child_name = object_get_canonical_path_component(OBJECT(drc)); child_name = object_get_canonical_path_component(OBJECT(drc));
trace_spapr_drc_realize_child(spapr_drc_index(drc), child_name); trace_spapr_drc_realize_child(spapr_drc_index(drc), child_name);
object_property_add_alias(root_container, link_name, object_property_add_alias(root_container, link_name,
@ -543,12 +553,10 @@ static void drc_unrealize(DeviceState *d)
{ {
SpaprDrc *drc = SPAPR_DR_CONNECTOR(d); SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
g_autofree gchar *name = g_strdup_printf("%x", spapr_drc_index(drc)); g_autofree gchar *name = g_strdup_printf("%x", spapr_drc_index(drc));
Object *root_container;
trace_spapr_drc_unrealize(spapr_drc_index(drc)); trace_spapr_drc_unrealize(spapr_drc_index(drc));
vmstate_unregister(VMSTATE_IF(drc), &vmstate_spapr_drc, drc); vmstate_unregister(VMSTATE_IF(drc), &vmstate_spapr_drc, drc);
root_container = container_get(object_get_root(), DRC_CONTAINER_PATH); object_property_del(drc_container_get(), name);
object_property_del(root_container, name);
} }
SpaprDrc *spapr_dr_connector_new(Object *owner, const char *type, SpaprDrc *spapr_dr_connector_new(Object *owner, const char *type,
@ -585,6 +593,8 @@ static void spapr_dr_connector_class_init(ObjectClass *k, void *data)
{ {
DeviceClass *dk = DEVICE_CLASS(k); DeviceClass *dk = DEVICE_CLASS(k);
drc_container_create();
dk->realize = drc_realize; dk->realize = drc_realize;
dk->unrealize = drc_unrealize; dk->unrealize = drc_unrealize;
/* /*
@ -796,9 +806,8 @@ static const TypeInfo spapr_drc_pmem_info = {
SpaprDrc *spapr_drc_by_index(uint32_t index) SpaprDrc *spapr_drc_by_index(uint32_t index)
{ {
Object *obj; Object *obj;
g_autofree gchar *name = g_strdup_printf("%s/%x", DRC_CONTAINER_PATH, g_autofree gchar *name = g_strdup_printf("%x", index);
index); obj = object_resolve_path_component(drc_container_get(), name);
obj = object_resolve_path(name, NULL);
return !obj ? NULL : SPAPR_DR_CONNECTOR(obj); return !obj ? NULL : SPAPR_DR_CONNECTOR(obj);
} }
@ -860,7 +869,7 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask)
/* aliases for all DRConnector objects will be rooted in QOM /* aliases for all DRConnector objects will be rooted in QOM
* composition tree at DRC_CONTAINER_PATH * composition tree at DRC_CONTAINER_PATH
*/ */
root_container = container_get(object_get_root(), DRC_CONTAINER_PATH); root_container = drc_container_get();
object_property_iter_init(&iter, root_container); object_property_iter_init(&iter, root_container);
while ((prop = object_property_iter_next(&iter))) { while ((prop = object_property_iter_next(&iter))) {
@ -953,7 +962,7 @@ void spapr_drc_reset_all(SpaprMachineState *spapr)
ObjectProperty *prop; ObjectProperty *prop;
ObjectPropertyIterator iter; ObjectPropertyIterator iter;
drc_container = container_get(object_get_root(), DRC_CONTAINER_PATH); drc_container = drc_container_get();
restart: restart:
object_property_iter_init(&iter, drc_container); object_property_iter_init(&iter, drc_container);
while ((prop = object_property_iter_next(&iter))) { while ((prop = object_property_iter_next(&iter))) {