From: Akihiko Odaki <akihiko.odaki@daynix.com>
To: Yuri Benditovich <yuri.benditovich@daynix.com>
Cc: "Jason Wang" <jasowang@redhat.com>,
"Dmitry Fleytman" <dmitry.fleytman@gmail.com>,
"Sriram Yagnaraman" <sriram.yagnaraman@ericsson.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Luigi Rizzo" <rizzo@iet.unipi.it>,
"Giuseppe Lettieri" <g.lettieri@iet.unipi.it>,
"Vincenzo Maffione" <v.maffione@gmail.com>,
"Andrew Melnychenko" <andrew@daynix.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
qemu-devel@nongnu.org,
20240428-rss-v10-0-73cbaa91aeb6@daynix.com
Subject: Re: [PATCH 1/3] qdev-properties: Add DEFINE_PROP_ON_OFF_AUTO_BIT64()
Date: Wed, 1 May 2024 15:36:56 +0900 [thread overview]
Message-ID: <f40be341-396c-4d0b-804e-63132ad81d80@daynix.com> (raw)
In-Reply-To: <CAOEp5Oe-uO+Q+btn0bqs1tA-zCc9qth7ngR-fVzDGnSE41yJfg@mail.gmail.com>
On 2024/04/30 23:41, Yuri Benditovich wrote:
> On Sun, Apr 28, 2024 at 10:21 AM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>>
>> DEFINE_PROP_ON_OFF_AUTO_BIT64() corresponds to DEFINE_PROP_ON_OFF_AUTO()
>> as DEFINE_PROP_BIT64() corresponds to DEFINE_PROP_BOOL(). The difference
>> is that DEFINE_PROP_ON_OFF_AUTO_BIT64() exposes OnOffAuto instead of
>> bool.
>>
>> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
>> ---
>> include/hw/qdev-properties.h | 18 ++++++++++++
>> hw/core/qdev-properties.c | 65 +++++++++++++++++++++++++++++++++++++++++++-
>> 2 files changed, 82 insertions(+), 1 deletion(-)
>>
>> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
>> index 09aa04ca1e27..afec53a48470 100644
>> --- a/include/hw/qdev-properties.h
>> +++ b/include/hw/qdev-properties.h
>> @@ -43,11 +43,22 @@ struct PropertyInfo {
>> ObjectPropertyRelease *release;
>> };
>>
>> +/**
>> + * struct OnOffAutoBit64 - OnOffAuto storage with 64 elements.
>> + * @on_bits: Bitmap of elements with "on".
>> + * @auto_bits: Bitmap of elements with "auto".
>> + */
>> +typedef struct OnOffAutoBit64 {
>> + uint64_t on_bits;
>> + uint64_t auto_bits;
>> +} OnOffAutoBit64;
>> +
>>
>> /*** qdev-properties.c ***/
>>
>> extern const PropertyInfo qdev_prop_bit;
>> extern const PropertyInfo qdev_prop_bit64;
>> +extern const PropertyInfo qdev_prop_on_off_auto_bit64;
>> extern const PropertyInfo qdev_prop_bool;
>> extern const PropertyInfo qdev_prop_enum;
>> extern const PropertyInfo qdev_prop_uint8;
>> @@ -100,6 +111,13 @@ extern const PropertyInfo qdev_prop_link;
>> .set_default = true, \
>> .defval.u = (bool)_defval)
>>
>> +#define DEFINE_PROP_ON_OFF_AUTO_BIT64(_name, _state, _field, _bit, _defval) \
>> + DEFINE_PROP(_name, _state, _field, qdev_prop_on_off_auto_bit64, \
>> + OnOffAutoBit64, \
>> + .bitnr = (_bit), \
>> + .set_default = true, \
>> + .defval.i = (OnOffAuto)_defval)
>> +
>> #define DEFINE_PROP_BOOL(_name, _state, _field, _defval) \
>> DEFINE_PROP(_name, _state, _field, qdev_prop_bool, bool, \
>> .set_default = true, \
>> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
>> index 7d6fa726fdf2..b96f54a1b912 100644
>> --- a/hw/core/qdev-properties.c
>> +++ b/hw/core/qdev-properties.c
>> @@ -188,7 +188,8 @@ const PropertyInfo qdev_prop_bit = {
>>
>> static uint64_t qdev_get_prop_mask64(Property *prop)
>> {
>> - assert(prop->info == &qdev_prop_bit64);
>> + assert(prop->info == &qdev_prop_bit64 ||
>> + prop->info == &qdev_prop_on_off_auto_bit64);
>> return 0x1ull << prop->bitnr;
>> }
>>
>> @@ -233,6 +234,68 @@ const PropertyInfo qdev_prop_bit64 = {
>> .set_default_value = set_default_value_bool,
>> };
>>
>> +static void prop_get_on_off_auto_bit64(Object *obj, Visitor *v,
>> + const char *name, void *opaque,
>> + Error **errp)
>> +{
>> + Property *prop = opaque;
>> + OnOffAutoBit64 *p = object_field_prop_ptr(obj, prop);
>> + int value;
>> + uint64_t mask = qdev_get_prop_mask64(prop);
>> +
>> + if (p->auto_bits & mask) {
>> + value = ON_OFF_AUTO_AUTO;
>> + } else if (p->on_bits & mask) {
>> + value = ON_OFF_AUTO_ON;
>> + } else {
>> + value = ON_OFF_AUTO_OFF;
>> + }
>> +
>> + visit_type_enum(v, name, &value, &OnOffAuto_lookup, errp);
>> +}
>> +
>> +static void prop_set_on_off_auto_bit64(Object *obj, Visitor *v,
>> + const char *name, void *opaque,
>> + Error **errp)
>> +{
>> + Property *prop = opaque;
>> + OnOffAutoBit64 *p = object_field_prop_ptr(obj, prop);
>> + int value;
>> + uint64_t mask = qdev_get_prop_mask64(prop);
>> +
>> + if (!visit_type_enum(v, name, &value, &OnOffAuto_lookup, errp)) {
>> + return;
>> + }
>> +
>> + switch (value) {
>> + case ON_OFF_AUTO_AUTO:
>> + p->on_bits &= ~mask;
>> + p->auto_bits |= mask;
>> + break;
>> +
>> + case ON_OFF_AUTO_ON:
>> + p->on_bits |= mask;
>> + p->auto_bits &= ~mask;
>> + break;
>> +
>> + case ON_OFF_AUTO_OFF:
>> + p->on_bits &= ~mask;
>> + p->auto_bits &= ~mask;
>> + break;
>> + }
>> +}
>> +
>> +const PropertyInfo qdev_prop_on_off_auto_bit64 = {
>> + .name = "bool",
>
> Does it mean that the name of this tristate type is "bool"? Or I miss something?
No, this should be OnOffAuto. Thanks for pointing out this; I'll fix
this in the next version.
next prev parent reply other threads:[~2024-05-01 6:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-28 7:21 [PATCH 0/3] virtio-net: Convert feature properties to OnOffAuto Akihiko Odaki
2024-04-28 7:21 ` [PATCH 1/3] qdev-properties: Add DEFINE_PROP_ON_OFF_AUTO_BIT64() Akihiko Odaki
2024-04-30 14:41 ` Yuri Benditovich
2024-05-01 6:36 ` Akihiko Odaki [this message]
2024-04-28 7:21 ` [PATCH 2/3] virtio-net: Convert feature properties to OnOffAuto Akihiko Odaki
2024-04-30 15:02 ` Yuri Benditovich
2024-05-01 7:06 ` Akihiko Odaki
2024-04-28 7:21 ` [PATCH 3/3] virtio-net: Report RSS warning at device realization Akihiko Odaki
2024-04-29 7:05 ` [PATCH 0/3] virtio-net: Convert feature properties to OnOffAuto Michael S. Tsirkin
2024-05-01 7:20 ` Akihiko Odaki
2024-05-06 3:48 ` Jason Wang
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=f40be341-396c-4d0b-804e-63132ad81d80@daynix.com \
--to=akihiko.odaki@daynix.com \
--cc=20240428-rss-v10-0-73cbaa91aeb6@daynix.com \
--cc=andrew@daynix.com \
--cc=berrange@redhat.com \
--cc=dmitry.fleytman@gmail.com \
--cc=eduardo@habkost.net \
--cc=g.lettieri@iet.unipi.it \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rizzo@iet.unipi.it \
--cc=sriram.yagnaraman@ericsson.com \
--cc=v.maffione@gmail.com \
--cc=yuri.benditovich@daynix.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).