* [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo
@ 2020-08-22 5:33 Alistair Francis
2020-08-22 10:25 ` Philippe Mathieu-Daudé
2020-08-24 20:35 ` Eduardo Habkost
0 siblings, 2 replies; 5+ messages in thread
From: Alistair Francis @ 2020-08-22 5:33 UTC (permalink / raw)
To: qemu-devel, ehabkost; +Cc: alistair23, alistair.francis
Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
hw/core/register.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/core/register.c b/hw/core/register.c
index ddf91eb445..5e8e8199d0 100644
--- a/hw/core/register.c
+++ b/hw/core/register.c
@@ -180,11 +180,7 @@ void register_init(RegisterInfo *reg)
{
assert(reg);
- if (!reg->data || !reg->access) {
- return;
- }
- object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER);
}
void register_write_memory(void *opaque, hwaddr addr,
@@ -269,13 +265,20 @@ static RegisterInfoArray *register_init_block(DeviceState *owner,
int index = rae[i].addr / data_size;
RegisterInfo *r = &ri[index];
+ if (data + data_size * index == 0 || !&rae[i]) {
+ continue;
+ }
+
+ /* Init the register, this will zero it. */
+ object_initialize((void *)r, sizeof(*r), TYPE_REGISTER);
+
+ /* Set the properties of the register */
*r = (RegisterInfo) {
.data = data + data_size * index,
.data_size = data_size,
.access = &rae[i],
.opaque = owner,
};
- register_init(r);
r_array->r[i] = r;
}
@@ -329,6 +332,7 @@ static const TypeInfo register_info = {
.name = TYPE_REGISTER,
.parent = TYPE_DEVICE,
.class_init = register_class_init,
+ .instance_size = sizeof(RegisterInfo),
};
static void register_register_types(void)
--
2.28.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo
2020-08-22 5:33 [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo Alistair Francis
@ 2020-08-22 10:25 ` Philippe Mathieu-Daudé
2020-08-25 17:29 ` Alistair Francis
2020-08-24 20:35 ` Eduardo Habkost
1 sibling, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-22 10:25 UTC (permalink / raw)
To: Alistair Francis, qemu-devel, ehabkost; +Cc: alistair23
Hi Alistair,
On 8/22/20 7:33 AM, Alistair Francis wrote:
> Reported-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
> hw/core/register.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/hw/core/register.c b/hw/core/register.c
> index ddf91eb445..5e8e8199d0 100644
> --- a/hw/core/register.c
> +++ b/hw/core/register.c
> @@ -180,11 +180,7 @@ void register_init(RegisterInfo *reg)
> {
> assert(reg);
>
> - if (!reg->data || !reg->access) {
> - return;
> - }
>
> - object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER);
Can we remove register_init()? Are concerned is it is declared
publicly in "hw/register.h"?
> }
>
> void register_write_memory(void *opaque, hwaddr addr,
> @@ -269,13 +265,20 @@ static RegisterInfoArray *register_init_block(DeviceState *owner,
> int index = rae[i].addr / data_size;
> RegisterInfo *r = &ri[index];
>
> + if (data + data_size * index == 0 || !&rae[i]) {
> + continue;
> + }
> +
> + /* Init the register, this will zero it. */
> + object_initialize((void *)r, sizeof(*r), TYPE_REGISTER);
> +
> + /* Set the properties of the register */
> *r = (RegisterInfo) {
> .data = data + data_size * index,
> .data_size = data_size,
> .access = &rae[i],
> .opaque = owner,
> };
> - register_init(r);
>
> r_array->r[i] = r;
> }
> @@ -329,6 +332,7 @@ static const TypeInfo register_info = {
> .name = TYPE_REGISTER,
> .parent = TYPE_DEVICE,
> .class_init = register_class_init,
> + .instance_size = sizeof(RegisterInfo),
> };
>
> static void register_register_types(void)
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo
2020-08-22 10:25 ` Philippe Mathieu-Daudé
@ 2020-08-25 17:29 ` Alistair Francis
0 siblings, 0 replies; 5+ messages in thread
From: Alistair Francis @ 2020-08-25 17:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: ehabkost, Alistair Francis, qemu-devel@nongnu.org Developers
On Sat, Aug 22, 2020 at 3:25 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Hi Alistair,
>
> On 8/22/20 7:33 AM, Alistair Francis wrote:
> > Reported-by: Eduardo Habkost <ehabkost@redhat.com>
> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> > ---
> > hw/core/register.c | 14 +++++++++-----
> > 1 file changed, 9 insertions(+), 5 deletions(-)
> >
> > diff --git a/hw/core/register.c b/hw/core/register.c
> > index ddf91eb445..5e8e8199d0 100644
> > --- a/hw/core/register.c
> > +++ b/hw/core/register.c
> > @@ -180,11 +180,7 @@ void register_init(RegisterInfo *reg)
> > {
> > assert(reg);
> >
> > - if (!reg->data || !reg->access) {
> > - return;
> > - }
> >
> > - object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER);
>
> Can we remove register_init()? Are concerned is it is declared
> publicly in "hw/register.h"?
Argh, I just missed this. Fixed in v2.
Alistair
>
> > }
> >
> > void register_write_memory(void *opaque, hwaddr addr,
> > @@ -269,13 +265,20 @@ static RegisterInfoArray *register_init_block(DeviceState *owner,
> > int index = rae[i].addr / data_size;
> > RegisterInfo *r = &ri[index];
> >
> > + if (data + data_size * index == 0 || !&rae[i]) {
> > + continue;
> > + }
> > +
> > + /* Init the register, this will zero it. */
> > + object_initialize((void *)r, sizeof(*r), TYPE_REGISTER);
> > +
> > + /* Set the properties of the register */
> > *r = (RegisterInfo) {
> > .data = data + data_size * index,
> > .data_size = data_size,
> > .access = &rae[i],
> > .opaque = owner,
> > };
> > - register_init(r);
> >
> > r_array->r[i] = r;
> > }
> > @@ -329,6 +332,7 @@ static const TypeInfo register_info = {
> > .name = TYPE_REGISTER,
> > .parent = TYPE_DEVICE,
> > .class_init = register_class_init,
> > + .instance_size = sizeof(RegisterInfo),
> > };
> >
> > static void register_register_types(void)
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo
2020-08-22 5:33 [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo Alistair Francis
2020-08-22 10:25 ` Philippe Mathieu-Daudé
@ 2020-08-24 20:35 ` Eduardo Habkost
2020-08-25 17:29 ` Alistair Francis
1 sibling, 1 reply; 5+ messages in thread
From: Eduardo Habkost @ 2020-08-24 20:35 UTC (permalink / raw)
To: Alistair Francis; +Cc: alistair23, qemu-devel
On Fri, Aug 21, 2020 at 10:33:06PM -0700, Alistair Francis wrote:
> Reported-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
> hw/core/register.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/hw/core/register.c b/hw/core/register.c
> index ddf91eb445..5e8e8199d0 100644
> --- a/hw/core/register.c
> +++ b/hw/core/register.c
> @@ -180,11 +180,7 @@ void register_init(RegisterInfo *reg)
> {
> assert(reg);
>
> - if (!reg->data || !reg->access) {
> - return;
> - }
>
> - object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER);
> }
>
> void register_write_memory(void *opaque, hwaddr addr,
> @@ -269,13 +265,20 @@ static RegisterInfoArray *register_init_block(DeviceState *owner,
> int index = rae[i].addr / data_size;
> RegisterInfo *r = &ri[index];
>
> + if (data + data_size * index == 0 || !&rae[i]) {
> + continue;
> + }
> +
> + /* Init the register, this will zero it. */
> + object_initialize((void *)r, sizeof(*r), TYPE_REGISTER);
> +
> + /* Set the properties of the register */
> *r = (RegisterInfo) {
> .data = data + data_size * index,
> .data_size = data_size,
> .access = &rae[i],
> .opaque = owner,
> };
This doesn't look right. Won't this wipe out all DeviceState
data in r->parent_obj?
> - register_init(r);
>
> r_array->r[i] = r;
> }
> @@ -329,6 +332,7 @@ static const TypeInfo register_info = {
> .name = TYPE_REGISTER,
> .parent = TYPE_DEVICE,
> .class_init = register_class_init,
> + .instance_size = sizeof(RegisterInfo),
> };
>
> static void register_register_types(void)
> --
> 2.28.0
>
>
--
Eduardo
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo
2020-08-24 20:35 ` Eduardo Habkost
@ 2020-08-25 17:29 ` Alistair Francis
0 siblings, 0 replies; 5+ messages in thread
From: Alistair Francis @ 2020-08-25 17:29 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: Alistair Francis, qemu-devel@nongnu.org Developers
On Mon, Aug 24, 2020 at 2:59 PM Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> On Fri, Aug 21, 2020 at 10:33:06PM -0700, Alistair Francis wrote:
> > Reported-by: Eduardo Habkost <ehabkost@redhat.com>
> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> > ---
> > hw/core/register.c | 14 +++++++++-----
> > 1 file changed, 9 insertions(+), 5 deletions(-)
> >
> > diff --git a/hw/core/register.c b/hw/core/register.c
> > index ddf91eb445..5e8e8199d0 100644
> > --- a/hw/core/register.c
> > +++ b/hw/core/register.c
> > @@ -180,11 +180,7 @@ void register_init(RegisterInfo *reg)
> > {
> > assert(reg);
> >
> > - if (!reg->data || !reg->access) {
> > - return;
> > - }
> >
> > - object_initialize((void *)reg, sizeof(*reg), TYPE_REGISTER);
> > }
> >
> > void register_write_memory(void *opaque, hwaddr addr,
> > @@ -269,13 +265,20 @@ static RegisterInfoArray *register_init_block(DeviceState *owner,
> > int index = rae[i].addr / data_size;
> > RegisterInfo *r = &ri[index];
> >
> > + if (data + data_size * index == 0 || !&rae[i]) {
> > + continue;
> > + }
> > +
> > + /* Init the register, this will zero it. */
> > + object_initialize((void *)r, sizeof(*r), TYPE_REGISTER);
> > +
> > + /* Set the properties of the register */
> > *r = (RegisterInfo) {
> > .data = data + data_size * index,
> > .data_size = data_size,
> > .access = &rae[i],
> > .opaque = owner,
> > };
>
> This doesn't look right. Won't this wipe out all DeviceState
> data in r->parent_obj?
Yep, it will. Fixed in v2.
Alistair
>
> > - register_init(r);
> >
> > r_array->r[i] = r;
> > }
> > @@ -329,6 +332,7 @@ static const TypeInfo register_info = {
> > .name = TYPE_REGISTER,
> > .parent = TYPE_DEVICE,
> > .class_init = register_class_init,
> > + .instance_size = sizeof(RegisterInfo),
> > };
> >
> > static void register_register_types(void)
> > --
> > 2.28.0
> >
> >
>
> --
> Eduardo
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-25 17:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-22 5:33 [PATCH v1 1/1] core/register: Specify instance_size in the TypeInfo Alistair Francis
2020-08-22 10:25 ` Philippe Mathieu-Daudé
2020-08-25 17:29 ` Alistair Francis
2020-08-24 20:35 ` Eduardo Habkost
2020-08-25 17:29 ` Alistair Francis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).