Skip to contentSkip to conversation

hw/core/register: Mark the device with cannot_instantiate_with_device_add_yet

PATCH Superseded Thomas Huth 2 participants 2 messages Jan 30, 2017 – Feb 3, 2017

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hw/core/register: Mark the device with cannot_instantiate_with_device_add_yet

The "qemu,register" device needs to be wired up in source code, there is no way the user can add this device with the "-device" parameter or the "device_add" monitor command yet.

---
v2: Changed patch description and comment

 hw/core/register.c | 9 +++++++++
 1 file changed, 9 insertions(+)
hw/core/register.c +9 -0
index 4bfbc50..1416691 100644
@@ -274,9 +274,18 @@ void register_finalize_block(RegisterInfoArray *r_array)
     g_free(r_array);
 }
 
+static void register_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+
+    /* Needs to be wired up in source code, see register_init_block32() */
+    dc->cannot_instantiate_with_device_add_yet = true;
+}
+
 static const TypeInfo register_info = {
     .name  = TYPE_REGISTER,
     .parent = TYPE_DEVICE,
+    .class_init = register_class_init,
 };
 
 static void register_register_types(void)
Signature · 1 line
1.8.3.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 3 lines · Thomas Huth

The "qemu,register" device needs to be wired up in source code, there is no way the user can add this device with the "-device" parameter or the "device_add" monitor command yet.

Well, the user can (I tried), but it won't do squat then.

Quoted 12 lines

---
v2: Changed patch description and comment

 hw/core/register.c | 9 +++++++++
 1 file changed, 9 insertions(+)
hw/core/register.c +0 -0
index 4bfbc50..1416691 100644

hw/core/register.c void register_finalize_block(RegisterInfoArray *r_array) · line 281

Quoted 8 lines
hw/core/register.c +5 -0
@@ -274,9 +274,18 @@ void register_finalize_block(RegisterInfoArray *r_array)
     g_free(r_array);
 }
 
+static void register_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+
+    /* Needs to be wired up in source code, see register_init_block32() */

Bear with me... Please phrase this exactly like the similar comments elsewhere:

       /* Reason: needs to be wired up by register_init_block32() to work */

hw/core/register.c void register_finalize_block(RegisterInfoArray *r_array) · line 291

Quoted 10 lines
hw/core/register.c +4 -0
+    dc->cannot_instantiate_with_device_add_yet = true;
+}
+
 static const TypeInfo register_info = {
     .name  = TYPE_REGISTER,
     .parent = TYPE_DEVICE,
+    .class_init = register_class_init,
 };
 
 static void register_register_types(void)

With comment and commit message touched up: