From: Eduardo Habkost <ehabkost@redhat.com>
To: Alistair Francis <alistair.francis@wdc.com>
Cc: alistair23@gmail.com, qemu-devel@nongnu.org, f4bug@amsat.org
Subject: Re: [PATCH v2 1/1] core/register: Specify instance_size in the TypeInfo
Date: Wed, 26 Aug 2020 15:49:18 -0400 [thread overview]
Message-ID: <20200826194918.GG642093@habkost.net> (raw)
In-Reply-To: <4cf1beb7dafb9143c261d266557d3173bf160524.1598376594.git.alistair.francis@wdc.com>
On Tue, Aug 25, 2020 at 10:30:59AM -0700, Alistair Francis wrote:
> Reported-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
> hw/core/register.c | 31 +++++++++++++------------------
> 1 file changed, 13 insertions(+), 18 deletions(-)
>
> diff --git a/hw/core/register.c b/hw/core/register.c
> index ddf91eb445..31038bd7cc 100644
> --- a/hw/core/register.c
> +++ b/hw/core/register.c
> @@ -176,17 +176,6 @@ void register_reset(RegisterInfo *reg)
> }
> }
>
> -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,
> uint64_t value, unsigned size)
> {
> @@ -269,13 +258,18 @@ static RegisterInfoArray *register_init_block(DeviceState *owner,
> int index = rae[i].addr / data_size;
> RegisterInfo *r = &ri[index];
>
> - *r = (RegisterInfo) {
> - .data = data + data_size * index,
> - .data_size = data_size,
> - .access = &rae[i],
> - .opaque = owner,
> - };
> - register_init(r);
> + if (data + data_size * index == 0 || !&rae[i]) {
Do you know what's the goal of this check?
Can `data` or `rae` be NULL? If not, it seems impossible for
this condition to be true. If they can, this seems to be a weird
and fragile way of checking for NULL arguments.
> + continue;
> + }
> +
> + /* Init the register, this will zero it. */
> + object_initialize((void *)r, sizeof(*r), TYPE_REGISTER);
> +
> + /* Set the properties of the register */
> + r->data = data + data_size * index;
> + r->data_size = data_size;
> + r->access = &rae[i];
> + r->opaque = owner;
>
> r_array->r[i] = r;
> }
> @@ -329,6 +323,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
next prev parent reply other threads:[~2020-08-26 19:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 17:30 [PATCH v2 1/1] core/register: Specify instance_size in the TypeInfo Alistair Francis
2020-08-26 9:40 ` Philippe Mathieu-Daudé
2020-08-26 14:46 ` Eduardo Habkost
2020-08-26 21:20 ` Alistair Francis
2020-08-26 19:49 ` Eduardo Habkost [this message]
2020-08-26 21:52 ` Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200826194918.GG642093@habkost.net \
--to=ehabkost@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).