[ot] hw/opentitan: all: remove default ot_id string creation.

The parent should specify this property.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
(cherry picked from commit 851989e)

Author: rivos-eblot

hw/opentitan/ot_gpio_eg.c

@@ -147,9 +147,6 @@ struct OtGpioEgClass {
     ResettablePhases parent_phases;
 };
 
-
-static const char DEFAULT_OT_ID[] = "";
-
 static void ot_gpio_eg_update_backend(OtGpioEgState *s, bool force);
 
 static void ot_gpio_eg_update_irqs(OtGpioEgState *s)
@@ -711,10 +708,6 @@ static void ot_gpio_eg_reset_enter(Object *obj, ResetType type)
     OtGpioEgClass *c = OT_GPIO_EG_GET_CLASS(obj);
     OtGpioEgState *s = OT_GPIO_EG(obj);
 
-    if (!s->ot_id) {
-        s->ot_id = g_strdup(DEFAULT_OT_ID);
-    }
-
     trace_ot_gpio_reset(s->ot_id, "> enter");
     if (c->parent_phases.enter) {
         c->parent_phases.enter(obj, type);
@@ -777,6 +770,8 @@ static void ot_gpio_eg_realize(DeviceState *dev, Error **errp)
     OtGpioEgState *s = OT_GPIO_EG(dev);
     (void)errp;
 
+    g_assert(s->ot_id);
+
     qemu_chr_fe_set_handlers(&s->chr, &ot_gpio_eg_chr_can_receive,
                              &ot_gpio_eg_chr_receive,
                              &ot_gpio_eg_chr_event_hander,

hw/opentitan/ot_otp_dj.c

@@ -3933,13 +3933,10 @@ static void ot_otp_dj_reset_exit(Object *obj, ResetType type)
 
 static void ot_otp_dj_realize(DeviceState *dev, Error **errp)
 {
-    (void)errp;
     OtOTPDjState *s = OT_OTP_DJ(dev);
+    (void)errp;
 
-    if (!s->ot_id) {
-        s->ot_id =
-            g_strdup(object_get_canonical_path_component(OBJECT(s)->parent));
-    }
+    g_assert(s->ot_id);
 
     ot_otp_dj_configure_scrmbl_key(s);
     ot_otp_dj_configure_digest(s);

hw/opentitan/ot_rstmgr.c

@@ -573,10 +573,7 @@ static void ot_rstmgr_realize(DeviceState *dev, Error **errp)
     OtRstMgrState *s = OT_RSTMGR(dev);
     (void)errp;
 
-    if (!s->ot_id) {
-        s->ot_id =
-            g_strdup(object_get_canonical_path_component(OBJECT(s)->parent));
-    }
+    g_assert(s->ot_id);
 }
 
 static void ot_rstmgr_init(Object *obj)

hw/opentitan/ot_spi_host.c

@@ -1321,11 +1321,8 @@ static void ot_spi_host_realize(DeviceState *dev, Error **errp)
     OtSPIHostState *s = OT_SPI_HOST(dev);
     (void)errp;
 
+    g_assert(s->ot_id);
     g_assert(s->pclk);
-    if (!s->ot_id) {
-        s->ot_id =
-            g_strdup(object_get_canonical_path_component(OBJECT(s)->parent));
-    }
 
     s->cs_lines = g_new0(qemu_irq, (size_t)s->num_cs);
 

hw/opentitan/ot_unimp.c

@@ -258,10 +258,7 @@ static void ot_unimp_realize(DeviceState *dev, Error **errp)
 {
     OtUnimpState *s = OT_UNIMP(dev);
 
-    if (!s->ot_id) {
-        error_setg(errp, "ot_id property required for " TYPE_OT_UNIMP);
-        return;
-    }
+    g_assert(s->ot_id);
 
     if (!s->size || (s->size & 3u)) {
         error_setg(errp, "%s: invalid size", s->ot_id);