From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, patches@linaro.org,
Markus Armbruster <armbru@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 2/3] qdev: support properties which don't set a default value
Date: Tue, 11 Jul 2017 13:15:08 -0400 (EDT) [thread overview]
Message-ID: <1158652012.49603326.1499793308542.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <1499788408-10096-3-git-send-email-peter.maydell@linaro.org>
Hi
----- Original Message -----
> In some situations it's useful to have a qdev property which doesn't
> automatically set its default value when qdev_property_add_static is
> called (for instance when the default value is not constant).
>
> Support this by adding a flag to the Property struct indicating
> whether to set the default value. This replaces the existing test
> for whether the PorpertyInfo set_default_value function pointer is
> NULL, and we set the .set_default field to true for all those cases
> of struct Property which use a PropertyInfo with a non-NULL
> set_default_value, so behaviour remains the same as before.
>
> We define two new macros DEFINE_PROP_SIGNED_NODEFAULT and
> DEFINE_PROP_UNSIGNED_NODEFAULT, to cover the most plausible use cases
> of wanting to set an integer property with no default value.
>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
minor comment below
> ---
> Since the previous patch fixed the only case that was
> using a default value but not explicitly setting .defval.[ui],
> this patch is a bit easier to review: .set_default = true
> is added in exactly the places that initialize .defval.[ui].
> ---
> include/hw/qdev-core.h | 1 +
> include/hw/qdev-properties.h | 20 ++++++++++++++++++++
> hw/core/qdev.c | 2 +-
> 3 files changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
> index 9d7c1c0..d110163 100644
> --- a/include/hw/qdev-core.h
> +++ b/include/hw/qdev-core.h
> @@ -226,6 +226,7 @@ struct Property {
> PropertyInfo *info;
> ptrdiff_t offset;
> uint8_t bitnr;
> + bool set_default;
> union {
> int64_t i;
> uint64_t u;
> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
> index 36d040c..66816a5 100644
> --- a/include/hw/qdev-properties.h
> +++ b/include/hw/qdev-properties.h
> @@ -43,15 +43,24 @@ extern PropertyInfo qdev_prop_arraylen;
> .info = &(_prop), \
> .offset = offsetof(_state, _field) \
> + type_check(_type,typeof_field(_state, _field)), \
> + .set_default = true, \
> .defval.i = (_type)_defval, \
> }
>
> +#define DEFINE_PROP_SIGNED_NODEFAULT(_name, _state, _field, _prop, _type) {
> \
> + .name = (_name), \
> + .info = &(_prop), \
> + .offset = offsetof(_state, _field) \
> + + type_check(_type, typeof_field(_state, _field)), \
> + }
> +
> #define DEFINE_PROP_BIT(_name, _state, _field, _bit, _defval) { \
> .name = (_name), \
> .info = &(qdev_prop_bit), \
> .bitnr = (_bit), \
> .offset = offsetof(_state, _field) \
> + type_check(uint32_t,typeof_field(_state, _field)), \
> + .set_default = true, \
> .defval.u = (bool)_defval, \
> }
>
> @@ -60,15 +69,24 @@ extern PropertyInfo qdev_prop_arraylen;
> .info = &(_prop), \
> .offset = offsetof(_state, _field) \
> + type_check(_type, typeof_field(_state, _field)), \
> + .set_default = true, \
> .defval.u = (_type)_defval, \
> }
>
> +#define DEFINE_PROP_UNSIGNED_NODEFAULT(_name, _state, _field, _prop, _type)
> { \
> + .name = (_name), \
> + .info = &(_prop), \
> + .offset = offsetof(_state, _field) \
> + + type_check(_type, typeof_field(_state, _field)), \
> + }
> +
> #define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) { \
> .name = (_name), \
> .info = &(qdev_prop_bit64), \
> .bitnr = (_bit), \
> .offset = offsetof(_state, _field) \
> + type_check(uint64_t, typeof_field(_state, _field)), \
> + .set_default = true, \
> .defval.u = (bool)_defval, \
> }
>
> @@ -77,6 +95,7 @@ extern PropertyInfo qdev_prop_arraylen;
> .info = &(qdev_prop_bool), \
> .offset = offsetof(_state, _field) \
> + type_check(bool, typeof_field(_state, _field)), \
> + .set_default = true, \
> .defval.u = (bool)_defval, \
> }
>
> @@ -110,6 +129,7 @@ extern PropertyInfo qdev_prop_arraylen;
> _arrayfield, _arrayprop, _arraytype) { \
> .name = (PROP_ARRAY_LEN_PREFIX _name), \
> .info = &(qdev_prop_arraylen), \
> + .set_default = true, \
> .defval.u = 0, \
> .offset = offsetof(_state, _field) \
> + type_check(uint32_t, typeof_field(_state, _field)), \
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 849952a..96965a7 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -793,7 +793,7 @@ void qdev_property_add_static(DeviceState *dev, Property
> *prop,
> prop->info->description,
> &error_abort);
>
> - if (prop->info->set_default_value) {
> + if (prop->set_default) {
Not sure if it's worth to have an assert(prop->info->set_default_value), probably not necessary.
> prop->info->set_default_value(obj, prop);
> }
> }
> --
> 2.7.4
>
>
next prev parent reply other threads:[~2017-07-11 17:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-11 15:53 [Qemu-devel] [PATCH 0/3] Allow int props with no default, use them in ARM Peter Maydell
2017-07-11 15:53 ` [Qemu-devel] [PATCH 1/3] qdev-properties.h: Explicitly set the default value for arraylen properties Peter Maydell
2017-07-11 16:46 ` Marc-André Lureau
2017-07-13 14:11 ` Markus Armbruster
2017-07-13 14:26 ` Peter Maydell
2017-07-13 16:21 ` Markus Armbruster
2017-07-11 15:53 ` [Qemu-devel] [PATCH 2/3] qdev: support properties which don't set a default value Peter Maydell
2017-07-11 17:15 ` Marc-André Lureau [this message]
2017-07-11 17:25 ` Peter Maydell
2017-07-12 11:22 ` Markus Armbruster
2017-07-12 12:27 ` Peter Maydell
2017-07-13 15:38 ` Peter Maydell
2017-07-13 17:10 ` Markus Armbruster
2017-07-13 17:18 ` Peter Maydell
2017-07-13 18:25 ` Markus Armbruster
2017-07-11 15:53 ` [Qemu-devel] [PATCH 3/3] target/arm: Make Cortex-M3 and M4 default to 8 PMSA regions Peter Maydell
2017-07-11 17:18 ` Marc-André Lureau
2017-07-11 17:27 ` Peter Maydell
2017-07-11 17:30 ` Marc-André Lureau
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=1158652012.49603326.1499793308542.JavaMail.zimbra@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=armbru@redhat.com \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.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).