| Message ID | 20191018154212.13458-8-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Clean-ups: remove QDEV_PROP_PTR | expand |
On 10/18/19 5:42 PM, Marc-André Lureau wrote: > There is no "saar" property. Note: I haven't been able to test this > code. Help welcome. > > May fix commit 043715d1e0fbb3e3411be3f898c5b77b7f90327a ("target/mips: > Update ITU to utilize SAARI and SAAR CP0 registers") This seems a MIPS feature that is not fully mainstreamed, I suppose we miss the DSPRAM patches, see: https://www.mail-archive.com/qemu-devel@nongnu.org/msg638373.html This code is currently not reachable: $ git grep saarp hw/mips/cps.c:98: saar_present = (bool)env->saarp; target/mips/cpu.h:1103: int saarp; Unfortunately the author email is bouncing: host mips-com.mail.protection.outlook.com[104.47.46.36] said: 550 5.4.1 [yongbok.kim@mips.com]: Recipient address rejected: Access denied [BN3NAM04FT027.eop-NAM04.prod.protection.outlook.com] (in reply to RCPT TO command) > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > hw/mips/cps.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/mips/cps.c b/hw/mips/cps.c > index 1660f86908..c49868d5da 100644 > --- a/hw/mips/cps.c > +++ b/hw/mips/cps.c > @@ -106,7 +106,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) > object_property_set_bool(OBJECT(&s->itu), saar_present, "saar-present", > &err); > if (saar_present) { > - qdev_prop_set_ptr(DEVICE(&s->itu), "saar", (void *)&env->CP0_SAAR); > + s->itu.saar = &env->CP0_SAAR; > } > object_property_set_bool(OBJECT(&s->itu), true, "realized", &err); > if (err != NULL) { >
On Friday, October 18, 2019, Marc-André Lureau <marcandre.lureau@redhat.com> wrote: > There is no "saar" property. Note: I haven't been able to test this > code. Help welcome. > > May fix commit 043715d1e0fbb3e3411be3f898c5b77b7f90327a ("target/mips: > Update ITU to utilize SAARI and SAAR CP0 registers") > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > hw/mips/cps.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > This was a part of larger body code that is still in process of upstreaming (and testing). I'll try to take a closer look in next few days. But, for 4.2, only minor changes are acceptable (like this patch). I'll get back to you when I get more info on all options. Thank you anyway! Aleksandar > diff --git a/hw/mips/cps.c b/hw/mips/cps.c > index 1660f86908..c49868d5da 100644 > --- a/hw/mips/cps.c > +++ b/hw/mips/cps.c > @@ -106,7 +106,7 @@ static void mips_cps_realize(DeviceState *dev, Error > **errp) > object_property_set_bool(OBJECT(&s->itu), saar_present, > "saar-present", > &err); > if (saar_present) { > - qdev_prop_set_ptr(DEVICE(&s->itu), "saar", (void > *)&env->CP0_SAAR); > + s->itu.saar = &env->CP0_SAAR; > } > object_property_set_bool(OBJECT(&s->itu), true, "realized", > &err); > if (err != NULL) { > -- > 2.23.0.606.g08da6496b6 > > >
diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 1660f86908..c49868d5da 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -106,7 +106,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) object_property_set_bool(OBJECT(&s->itu), saar_present, "saar-present", &err); if (saar_present) { - qdev_prop_set_ptr(DEVICE(&s->itu), "saar", (void *)&env->CP0_SAAR); + s->itu.saar = &env->CP0_SAAR; } object_property_set_bool(OBJECT(&s->itu), true, "realized", &err); if (err != NULL) {
There is no "saar" property. Note: I haven't been able to test this code. Help welcome. May fix commit 043715d1e0fbb3e3411be3f898c5b77b7f90327a ("target/mips: Update ITU to utilize SAARI and SAAR CP0 registers") Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- hw/mips/cps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)