From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3F6EC5519F for ; Tue, 17 Nov 2020 14:59:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39AF92168B for ; Tue, 17 Nov 2020 14:59:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IeHwvLYj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39AF92168B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf2SU-00020R-4x for qemu-devel@archiver.kernel.org; Tue, 17 Nov 2020 09:59:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf2Rd-0000xm-3y for qemu-devel@nongnu.org; Tue, 17 Nov 2020 09:58:57 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:46801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf2RZ-00013r-RI for qemu-devel@nongnu.org; Tue, 17 Nov 2020 09:58:56 -0500 Received: by mail-ej1-x642.google.com with SMTP id w13so29821173eju.13 for ; Tue, 17 Nov 2020 06:58:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wW2FjxjMrVZ5VNN8yJTUtJ6zPrStgGR6+AFEaPoEDjE=; b=IeHwvLYjC/wRwA5fPlmAwkTyjoR0GZ6Bcnn/g4IOA5d+KlsL/1U06lIDhFxKuhhSKL uZ+zO6vjkCDJD8NT8y9f6R9fXljzJ5VQfHbo84UmzJ2k0VrNMg4KhHwf7rNF0RgJUF/E rMNKLXuZlNFvgbP1CjA1flCI6Yoe0XgYrM+dZWqTZ7KTbq9NH9wOeQ+RXaNQ44xAOZoF ZiWDM3qkSFKB9UPPDkX4DEXCoLyMVQcgB6+qTrkmc8uz1Q241GUaPCrr/mkqOpl0CMpo 5MD636Lw2oTLhWPcKgHx+R6F3XQx8a4ThARzfTa0klm5qIj7zJ6v2+GZOPIYW6cbBg1n UeEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wW2FjxjMrVZ5VNN8yJTUtJ6zPrStgGR6+AFEaPoEDjE=; b=Zvd0n/GVngMjiYc5iAFmkGQBT2DQyGvv52iEDACpRP6IZZrjh28XLinemoJqGrkhI8 1Cr80shhj860i76bJVukRd/Hsq8SREQjXBgku+H0qa1o3x+ZYGPVwAHceByH+fGQhGA0 L48+91wvNbUE3zTwne0E5rNgbtypDT9QdVwF9RdHabCJpVoNgn66lBeG12QwIedvr1Pm tX2bfToES2CusdhWRuTO0ghNpA6kCqS+h6Azslo9uQTOrE09O22BoJBwXxJle2m7O8WW 1FPHiXm7tr2Y9Pwso0LQQk+vxY6tfD6WcFU2aXfrpO2sjOU31CXEXx3HkJ+umX4P1i4v XGzQ== X-Gm-Message-State: AOAM531xGq+ARg8XxMaahqomM+31TFCXsvBRRh7R37yXJzqZd+o8r1CL /A+emSek6p+3AfspL0x9JbcC5cg0T7D9Xyf39Fk= X-Google-Smtp-Source: ABdhPJyy7DnvzqlQmR6EjidcAxfI/3XORC9ZBjQY9SW1jzTe5Sbk+4Vo0/kVBhpzcYjRSLCxYQUGSiEfMdRiSN7DUFw= X-Received: by 2002:a17:906:bcd4:: with SMTP id lw20mr19243584ejb.527.1605625132131; Tue, 17 Nov 2020 06:58:52 -0800 (PST) MIME-Version: 1.0 References: <20201116224143.1284278-1-ehabkost@redhat.com> <20201116224143.1284278-4-ehabkost@redhat.com> <20201117144246.GD1235237@habkost.net> In-Reply-To: <20201117144246.GD1235237@habkost.net> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Tue, 17 Nov 2020 18:58:39 +0400 Message-ID: Subject: Re: [PATCH v2 3/8] qnum: QNumValue type for QNum value literals To: Eduardo Habkost Content-Type: multipart/alternative; boundary="000000000000a4ae8805b44ebb2f" Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=marcandre.lureau@gmail.com; helo=mail-ej1-x642.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , QEMU , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000a4ae8805b44ebb2f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Nov 17, 2020 at 6:42 PM Eduardo Habkost wrote= : > On Tue, Nov 17, 2020 at 12:37:56PM +0400, Marc-Andr=C3=A9 Lureau wrote: > > On Tue, Nov 17, 2020 at 2:43 AM Eduardo Habkost > wrote: > > > > > Provide a separate QNumValue type that can be used for QNum value > > > literals without the referencing counting and memory allocation > > > features provided by QObject. > > > > > > Signed-off-by: Eduardo Habkost > > > --- > > > Changes v1 -> v2: > > > * Fix "make check" failure, by updating check-qnum unit test to > > > use the new struct fields > > > --- > > > include/qapi/qmp/qnum.h | 40 +++++++++++++++++++-- > > > qobject/qnum.c | 78 ++++++++++++++++++++-------------------= -- > > > tests/check-qnum.c | 14 ++++---- > > > 3 files changed, 84 insertions(+), 48 deletions(-) > > > > > > diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h > > > index 55c27b1c24..62fbdfda68 100644 > > > --- a/include/qapi/qmp/qnum.h > > > +++ b/include/qapi/qmp/qnum.h > > > @@ -46,20 +46,56 @@ typedef enum { > > > * in range: qnum_get_try_int() / qnum_get_try_uint() check range an= d > > > * convert under the hood. > > > */ > > > -struct QNum { > > > - struct QObjectBase_ base; > > > + > > > +/** > > > + * struct QNumValue: the value of a QNum > > > + * > > > + * QNumValue literals can be constructed using the `QNUM_VAL_INT`, > > > + * `QNUM_VAL_UINT`, and `QNUM_VAL_DOUBLE` macros. > > > + */ > > > +typedef struct QNumValue { > > > + /* private: */ > > > QNumKind kind; > > > union { > > > int64_t i64; > > > uint64_t u64; > > > double dbl; > > > } u; > > > +} QNumValue; > > > + > > > +#define QNUM_VAL_INT(value) \ > > > + { .kind =3D QNUM_I64, .u.i64 =3D value } > > > +#define QNUM_VAL_UINT(value) \ > > > + { .kind =3D QNUM_U64, .u.u64 =3D value } > > > +#define QNUM_VAL_DOUBLE(value) \ > > > + { .kind =3D QNUM_DOUBLE, .u.dbl =3D value } > > > + > > > +struct QNum { > > > + struct QObjectBase_ base; > > > + QNumValue value; > > > }; > > > > > > +/** > > > + * qnum_from_int(): Create a new QNum from a QNumValue > > > > > > > Copy-pasta qnum_from_int() -> qnum_from_value() > > Oops! I will fix it in v3, or submit a fixup patch if that's the > only needed change. > > > > > I wonder if there is a check for that kind of mistake, as it may be > common. > > It looks like kernel-doc ignores what's before the colon in the > summary line. It probably shouldn't. > > > > > + * @value: QNumValue > > > + * > > > + * Return strong reference. > > > + */ > > > +QNum *qnum_from_value(QNumValue value); > > > > > + > > > QNum *qnum_from_int(int64_t value); > > > QNum *qnum_from_uint(uint64_t value); > > > QNum *qnum_from_double(double value); > > > > > > +/** > > > + * qnum_get_value(): Get QNumValue from QNum > > > + * @qn: QNum object > > > + */ > > > +static inline const QNumValue *qnum_get_value(const QNum *qn) > > > +{ > > > + return &qn->value; > > > +} > > > + > > > > > > > Nothing uses that function in this patch. Should be put into use. > > It is used in patch 5/8. Why do you think it's necessary to use > it in internal code too? > Not necessarily, just want to make sure we don't introduce dead code. Fine it's used later, perhaps worth noting in the commit message. > > > > > bool qnum_get_try_int(const QNum *qn, int64_t *val); > > > int64_t qnum_get_int(const QNum *qn); > > > > > > diff --git a/qobject/qnum.c b/qobject/qnum.c > > > index 69fd9a82d9..f80d4efd76 100644 > > > --- a/qobject/qnum.c > > > +++ b/qobject/qnum.c > > > @@ -15,6 +15,15 @@ > > > #include "qemu/osdep.h" > > > #include "qapi/qmp/qnum.h" > > > > > > +QNum *qnum_from_value(QNumValue value) > > > > > > > I wonder if it shouldn't be made "inline" in header too (if that can he= lp > > avoid argument copy). > > I'm unsure. I would make it inline (in a separate patch) if > there's evidence it's worth it. I expect the g_new() call to be > more expensive than any argument copying, though. > ok > > > > +{ > > > + QNum *qn =3D g_new(QNum, 1); > > > + > > > + qobject_init(QOBJECT(qn), QTYPE_QNUM); > > > + qn->value =3D value; > > > + return qn; > > > +} > > > + > > > /** > > > * qnum_from_int(): Create a new QNum from an int64_t > > > * @value: int64_t value > > > @@ -23,13 +32,7 @@ > > > */ > > > QNum *qnum_from_int(int64_t value) > > > { > > > - QNum *qn =3D g_new(QNum, 1); > > > - > > > - qobject_init(QOBJECT(qn), QTYPE_QNUM); > > > - qn->kind =3D QNUM_I64; > > > - qn->u.i64 =3D value; > > > - > > > - return qn; > > > + return qnum_from_value((QNumValue) QNUM_VAL_INT(value)); > > > } > > > > > > /** > > > @@ -40,13 +43,7 @@ QNum *qnum_from_int(int64_t value) > > > */ > > > QNum *qnum_from_uint(uint64_t value) > > > { > > > - QNum *qn =3D g_new(QNum, 1); > > > - > > > - qobject_init(QOBJECT(qn), QTYPE_QNUM); > > > - qn->kind =3D QNUM_U64; > > > - qn->u.u64 =3D value; > > > - > > > - return qn; > > > + return qnum_from_value((QNumValue) QNUM_VAL_UINT(value)); > > > } > > > > > > /** > > > @@ -57,13 +54,7 @@ QNum *qnum_from_uint(uint64_t value) > > > */ > > > QNum *qnum_from_double(double value) > > > { > > > - QNum *qn =3D g_new(QNum, 1); > > > - > > > - qobject_init(QOBJECT(qn), QTYPE_QNUM); > > > - qn->kind =3D QNUM_DOUBLE; > > > - qn->u.dbl =3D value; > > > - > > > - return qn; > > > + return qnum_from_value((QNumValue) QNUM_VAL_DOUBLE(value)); > > > } > > > > > > /** > > > @@ -75,15 +66,17 @@ QNum *qnum_from_double(double value) > > > */ > > > bool qnum_get_try_int(const QNum *qn, int64_t *val) > > > { > > > - switch (qn->kind) { > > > + const QNumValue *qv =3D &qn->value; > > > + > > > + switch (qv->kind) { > > > case QNUM_I64: > > > - *val =3D qn->u.i64; > > > + *val =3D qv->u.i64; > > > return true; > > > case QNUM_U64: > > > - if (qn->u.u64 > INT64_MAX) { > > > + if (qv->u.u64 > INT64_MAX) { > > > return false; > > > } > > > - *val =3D qn->u.u64; > > > + *val =3D qv->u.u64; > > > return true; > > > case QNUM_DOUBLE: > > > return false; > > > @@ -116,15 +109,17 @@ int64_t qnum_get_int(const QNum *qn) > > > */ > > > bool qnum_get_try_uint(const QNum *qn, uint64_t *val) > > > { > > > - switch (qn->kind) { > > > + const QNumValue *qv =3D &qn->value; > > > + > > > + switch (qv->kind) { > > > case QNUM_I64: > > > - if (qn->u.i64 < 0) { > > > + if (qv->u.i64 < 0) { > > > return false; > > > } > > > - *val =3D qn->u.i64; > > > + *val =3D qv->u.i64; > > > return true; > > > case QNUM_U64: > > > - *val =3D qn->u.u64; > > > + *val =3D qv->u.u64; > > > return true; > > > case QNUM_DOUBLE: > > > return false; > > > @@ -156,13 +151,15 @@ uint64_t qnum_get_uint(const QNum *qn) > > > */ > > > double qnum_get_double(const QNum *qn) > > > { > > > - switch (qn->kind) { > > > + const QNumValue *qv =3D &qn->value; > > > + > > > + switch (qv->kind) { > > > case QNUM_I64: > > > - return qn->u.i64; > > > + return qv->u.i64; > > > case QNUM_U64: > > > - return qn->u.u64; > > > + return qv->u.u64; > > > case QNUM_DOUBLE: > > > - return qn->u.dbl; > > > + return qv->u.dbl; > > > } > > > > > > assert(0); > > > @@ -171,14 +168,15 @@ double qnum_get_double(const QNum *qn) > > > > > > char *qnum_to_string(QNum *qn) > > > { > > > + const QNumValue *qv =3D &qn->value; > > > > > > > qnum_get_value() ? > > I prefer to not hide this behind a function call, in internal > code. But I don't mind changing it if you think it's important. > no, it's ok to me > > > > > char *buffer; > > > int len; > > > > > > - switch (qn->kind) { > > > + switch (qv->kind) { > > > case QNUM_I64: > > > - return g_strdup_printf("%" PRId64, qn->u.i64); > > > + return g_strdup_printf("%" PRId64, qv->u.i64); > > > case QNUM_U64: > > > - return g_strdup_printf("%" PRIu64, qn->u.u64); > > > + return g_strdup_printf("%" PRIu64, qv->u.u64); > > > case QNUM_DOUBLE: > > > /* FIXME: snprintf() is locale dependent; but JSON requires > > > * numbers to be formatted as if in the C locale. Dependence > > > @@ -189,7 +187,7 @@ char *qnum_to_string(QNum *qn) > > > * rounding errors; we should be using DBL_DECIMAL_DIG (17), > > > * and only rounding to a shorter number if the result would > > > * still produce the same floating point value. */ > > > - buffer =3D g_strdup_printf("%f" , qn->u.dbl); > > > + buffer =3D g_strdup_printf("%f" , qv->u.dbl); > > > len =3D strlen(buffer); > > > while (len > 0 && buffer[len - 1] =3D=3D '0') { > > > len--; > > > @@ -221,8 +219,10 @@ char *qnum_to_string(QNum *qn) > > > */ > > > bool qnum_is_equal(const QObject *x, const QObject *y) > > > { > > > - QNum *num_x =3D qobject_to(QNum, x); > > > - QNum *num_y =3D qobject_to(QNum, y); > > > + const QNum *qnum_x =3D qobject_to(QNum, x); > > > + const QNum *qnum_y =3D qobject_to(QNum, y); > > > + const QNumValue *num_x =3D &qnum_x->value; > > > + const QNumValue *num_y =3D &qnum_y->value; > > > > > > switch (num_x->kind) { > > > case QNUM_I64: > > > diff --git a/tests/check-qnum.c b/tests/check-qnum.c > > > index 4105015872..9499b0d845 100644 > > > --- a/tests/check-qnum.c > > > +++ b/tests/check-qnum.c > > > @@ -30,8 +30,8 @@ static void qnum_from_int_test(void) > > > > > > qn =3D qnum_from_int(value); > > > g_assert(qn !=3D NULL); > > > - g_assert_cmpint(qn->kind, =3D=3D, QNUM_I64); > > > - g_assert_cmpint(qn->u.i64, =3D=3D, value); > > > + g_assert_cmpint(qn->value.kind, =3D=3D, QNUM_I64); > > > + g_assert_cmpint(qn->value.u.i64, =3D=3D, value); > > > g_assert_cmpint(qn->base.refcnt, =3D=3D, 1); > > > g_assert_cmpint(qobject_type(QOBJECT(qn)), =3D=3D, QTYPE_QNUM); > > > > > > @@ -45,8 +45,8 @@ static void qnum_from_uint_test(void) > > > > > > qn =3D qnum_from_uint(value); > > > g_assert(qn !=3D NULL); > > > - g_assert_cmpint(qn->kind, =3D=3D, QNUM_U64); > > > - g_assert(qn->u.u64 =3D=3D value); > > > + g_assert_cmpint(qn->value.kind, =3D=3D, QNUM_U64); > > > + g_assert(qn->value.u.u64 =3D=3D value); > > > g_assert(qn->base.refcnt =3D=3D 1); > > > g_assert(qobject_type(QOBJECT(qn)) =3D=3D QTYPE_QNUM); > > > > > > @@ -60,8 +60,8 @@ static void qnum_from_double_test(void) > > > > > > qn =3D qnum_from_double(value); > > > g_assert(qn !=3D NULL); > > > - g_assert_cmpint(qn->kind, =3D=3D, QNUM_DOUBLE); > > > - g_assert_cmpfloat(qn->u.dbl, =3D=3D, value); > > > + g_assert_cmpint(qn->value.kind, =3D=3D, QNUM_DOUBLE); > > > + g_assert_cmpfloat(qn->value.u.dbl, =3D=3D, value); > > > g_assert_cmpint(qn->base.refcnt, =3D=3D, 1); > > > g_assert_cmpint(qobject_type(QOBJECT(qn)), =3D=3D, QTYPE_QNUM); > > > > > > @@ -74,7 +74,7 @@ static void qnum_from_int64_test(void) > > > const int64_t value =3D 0x1234567890abcdefLL; > > > > > > qn =3D qnum_from_int(value); > > > - g_assert_cmpint((int64_t) qn->u.i64, =3D=3D, value); > > > + g_assert_cmpint((int64_t) qn->value.u.i64, =3D=3D, value); > > > > > > qobject_unref(qn); > > > } > > > -- > > > 2.28.0 > > > > > > > > > > > lgtm otherwise > > Thanks! > > -- > Eduardo > > --=20 Marc-Andr=C3=A9 Lureau --000000000000a4ae8805b44ebb2f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Nov 17, 2020 at 6:42 PM Eduar= do Habkost <ehabkost@redhat.com> wrote:
On= Tue, Nov 17, 2020 at 12:37:56PM +0400, Marc-Andr=C3=A9 Lureau wrote:
> On Tue, Nov 17, 2020 at 2:43 AM Eduardo Habkost <ehabkost@redhat.com> wrote: >
> > Provide a separate QNumValue type that can be used for QNum value=
> > literals without the referencing counting and memory allocation > > features provided by QObject.
> >
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > ---
> > Changes v1 -> v2:
> > * Fix "make check" failure, by updating check-qnum unit= test to
> >=C2=A0 =C2=A0use the new struct fields
> > ---
> >=C2=A0 include/qapi/qmp/qnum.h | 40 +++++++++++++++++++--
> >=C2=A0 qobject/qnum.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 78 +++++= +++++++++++++++---------------------
> >=C2=A0 tests/check-qnum.c=C2=A0 =C2=A0 =C2=A0 | 14 ++++----
> >=C2=A0 3 files changed, 84 insertions(+), 48 deletions(-)
> >
> > diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h > > index 55c27b1c24..62fbdfda68 100644
> > --- a/include/qapi/qmp/qnum.h
> > +++ b/include/qapi/qmp/qnum.h
> > @@ -46,20 +46,56 @@ typedef enum {
> >=C2=A0 =C2=A0* in range: qnum_get_try_int() / qnum_get_try_uint() = check range and
> >=C2=A0 =C2=A0* convert under the hood.
> >=C2=A0 =C2=A0*/
> > -struct QNum {
> > -=C2=A0 =C2=A0 struct QObjectBase_ base;
> > +
> > +/**
> > + * struct QNumValue: the value of a QNum
> > + *
> > + * QNumValue literals can be constructed using the `QNUM_VAL_INT= `,
> > + * `QNUM_VAL_UINT`, and `QNUM_VAL_DOUBLE` macros.
> > + */
> > +typedef struct QNumValue {
> > +=C2=A0 =C2=A0 /* private: */
> >=C2=A0 =C2=A0 =C2=A0 QNumKind kind;
> >=C2=A0 =C2=A0 =C2=A0 union {
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int64_t i64;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t u64;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 double dbl;
> >=C2=A0 =C2=A0 =C2=A0 } u;
> > +} QNumValue;
> > +
> > +#define QNUM_VAL_INT(value) \
> > +=C2=A0 =C2=A0 { .kind =3D QNUM_I64, .u.i64 =3D value }
> > +#define QNUM_VAL_UINT(value) \
> > +=C2=A0 =C2=A0 { .kind =3D QNUM_U64, .u.u64 =3D value }
> > +#define QNUM_VAL_DOUBLE(value) \
> > +=C2=A0 =C2=A0 { .kind =3D QNUM_DOUBLE, .u.dbl =3D value }
> > +
> > +struct QNum {
> > +=C2=A0 =C2=A0 struct QObjectBase_ base;
> > +=C2=A0 =C2=A0 QNumValue value;
> >=C2=A0 };
> >
> > +/**
> > + * qnum_from_int(): Create a new QNum from a QNumValue
> >
>
> Copy-pasta qnum_from_int() -> qnum_from_value()

Oops!=C2=A0 I will fix it in v3, or submit a fixup patch if that's the<= br> only needed change.

>
> I wonder if there is a check for that kind of mistake, as it may be co= mmon.

It looks like kernel-doc ignores what's before the colon in the
summary line.=C2=A0 It probably shouldn't.

>
> + * @value: QNumValue
> > + *
> > + * Return strong reference.
> > + */
> > +QNum *qnum_from_value(QNumValue value);
> >
> +
> >=C2=A0 QNum *qnum_from_int(int64_t value);
> >=C2=A0 QNum *qnum_from_uint(uint64_t value);
> >=C2=A0 QNum *qnum_from_double(double value);
> >
> > +/**
> > + * qnum_get_value(): Get QNumValue from QNum
> > + * @qn: QNum object
> > + */
> > +static inline const QNumValue *qnum_get_value(const QNum *qn) > > +{
> > +=C2=A0 =C2=A0 return &qn->value;
> > +}
> > +
> >
>
> Nothing uses that function in this patch. Should be put into use.

It is used in patch 5/8.=C2=A0 Why do you think it's necessary to use it in internal code too?

Not necessaril= y, just want to make sure we don't introduce dead code. Fine it's u= sed later, perhaps worth noting in the commit message.

>
>=C2=A0 bool qnum_get_try_int(const QNum *qn, int64_t *val);
> >=C2=A0 int64_t qnum_get_int(const QNum *qn);
> >
> > diff --git a/qobject/qnum.c b/qobject/qnum.c
> > index 69fd9a82d9..f80d4efd76 100644
> > --- a/qobject/qnum.c
> > +++ b/qobject/qnum.c
> > @@ -15,6 +15,15 @@
> >=C2=A0 #include "qemu/osdep.h"
> >=C2=A0 #include "qapi/qmp/qnum.h"
> >
> > +QNum *qnum_from_value(QNumValue value)
> >
>
> I wonder if it shouldn't be made "inline" in header too = (if that can help
> avoid argument copy).

I'm unsure.=C2=A0 I would make it inline (in a separate patch) if
there's evidence it's worth it.=C2=A0 I expect the g_new() call to = be
more expensive than any argument copying, though.

=
ok


>
> +{
> > +=C2=A0 =C2=A0 QNum *qn =3D g_new(QNum, 1);
> > +
> > +=C2=A0 =C2=A0 qobject_init(QOBJECT(qn), QTYPE_QNUM);
> > +=C2=A0 =C2=A0 qn->value =3D value;
> > +=C2=A0 =C2=A0 return qn;
> > +}
> > +
> >=C2=A0 /**
> >=C2=A0 =C2=A0* qnum_from_int(): Create a new QNum from an int64_t<= br> > >=C2=A0 =C2=A0* @value: int64_t value
> > @@ -23,13 +32,7 @@
> >=C2=A0 =C2=A0*/
> >=C2=A0 QNum *qnum_from_int(int64_t value)
> >=C2=A0 {
> > -=C2=A0 =C2=A0 QNum *qn =3D g_new(QNum, 1);
> > -
> > -=C2=A0 =C2=A0 qobject_init(QOBJECT(qn), QTYPE_QNUM);
> > -=C2=A0 =C2=A0 qn->kind =3D QNUM_I64;
> > -=C2=A0 =C2=A0 qn->u.i64 =3D value;
> > -
> > -=C2=A0 =C2=A0 return qn;
> > +=C2=A0 =C2=A0 return qnum_from_value((QNumValue) QNUM_VAL_INT(va= lue));
> >=C2=A0 }
> >
> >=C2=A0 /**
> > @@ -40,13 +43,7 @@ QNum *qnum_from_int(int64_t value)
> >=C2=A0 =C2=A0*/
> >=C2=A0 QNum *qnum_from_uint(uint64_t value)
> >=C2=A0 {
> > -=C2=A0 =C2=A0 QNum *qn =3D g_new(QNum, 1);
> > -
> > -=C2=A0 =C2=A0 qobject_init(QOBJECT(qn), QTYPE_QNUM);
> > -=C2=A0 =C2=A0 qn->kind =3D QNUM_U64;
> > -=C2=A0 =C2=A0 qn->u.u64 =3D value;
> > -
> > -=C2=A0 =C2=A0 return qn;
> > +=C2=A0 =C2=A0 return qnum_from_value((QNumValue) QNUM_VAL_UINT(v= alue));
> >=C2=A0 }
> >
> >=C2=A0 /**
> > @@ -57,13 +54,7 @@ QNum *qnum_from_uint(uint64_t value)
> >=C2=A0 =C2=A0*/
> >=C2=A0 QNum *qnum_from_double(double value)
> >=C2=A0 {
> > -=C2=A0 =C2=A0 QNum *qn =3D g_new(QNum, 1);
> > -
> > -=C2=A0 =C2=A0 qobject_init(QOBJECT(qn), QTYPE_QNUM);
> > -=C2=A0 =C2=A0 qn->kind =3D QNUM_DOUBLE;
> > -=C2=A0 =C2=A0 qn->u.dbl =3D value;
> > -
> > -=C2=A0 =C2=A0 return qn;
> > +=C2=A0 =C2=A0 return qnum_from_value((QNumValue) QNUM_VAL_DOUBLE= (value));
> >=C2=A0 }
> >
> >=C2=A0 /**
> > @@ -75,15 +66,17 @@ QNum *qnum_from_double(double value)
> >=C2=A0 =C2=A0*/
> >=C2=A0 bool qnum_get_try_int(const QNum *qn, int64_t *val)
> >=C2=A0 {
> > -=C2=A0 =C2=A0 switch (qn->kind) {
> > +=C2=A0 =C2=A0 const QNumValue *qv =3D &qn->value;
> > +
> > +=C2=A0 =C2=A0 switch (qv->kind) {
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_I64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qn->u.i64;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qv->u.i64;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return true;
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_U64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (qn->u.u64 > INT64_MAX) { > > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (qv->u.u64 > INT64_MAX) { > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return false;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qn->u.u64;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qv->u.u64;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return true;
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_DOUBLE:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return false;
> > @@ -116,15 +109,17 @@ int64_t qnum_get_int(const QNum *qn)
> >=C2=A0 =C2=A0*/
> >=C2=A0 bool qnum_get_try_uint(const QNum *qn, uint64_t *val)
> >=C2=A0 {
> > -=C2=A0 =C2=A0 switch (qn->kind) {
> > +=C2=A0 =C2=A0 const QNumValue *qv =3D &qn->value;
> > +
> > +=C2=A0 =C2=A0 switch (qv->kind) {
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_I64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (qn->u.i64 < 0) {
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (qv->u.i64 < 0) {
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return false;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qn->u.i64;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qv->u.i64;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return true;
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_U64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qn->u.u64;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 *val =3D qv->u.u64;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return true;
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_DOUBLE:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return false;
> > @@ -156,13 +151,15 @@ uint64_t qnum_get_uint(const QNum *qn)
> >=C2=A0 =C2=A0*/
> >=C2=A0 double qnum_get_double(const QNum *qn)
> >=C2=A0 {
> > -=C2=A0 =C2=A0 switch (qn->kind) {
> > +=C2=A0 =C2=A0 const QNumValue *qv =3D &qn->value;
> > +
> > +=C2=A0 =C2=A0 switch (qv->kind) {
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_I64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return qn->u.i64;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return qv->u.i64;
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_U64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return qn->u.u64;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return qv->u.u64;
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_DOUBLE:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return qn->u.dbl;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return qv->u.dbl;
> >=C2=A0 =C2=A0 =C2=A0 }
> >
> >=C2=A0 =C2=A0 =C2=A0 assert(0);
> > @@ -171,14 +168,15 @@ double qnum_get_double(const QNum *qn)
> >
> >=C2=A0 char *qnum_to_string(QNum *qn)
> >=C2=A0 {
> > +=C2=A0 =C2=A0 const QNumValue *qv =3D &qn->value;
> >
>
> qnum_get_value() ?

I prefer to not hide this behind a function call, in internal
code.=C2=A0 But I don't mind changing it if you think it's importan= t.

no, it's ok to me


>
>=C2=A0 =C2=A0 =C2=A0 char *buffer;
> >=C2=A0 =C2=A0 =C2=A0 int len;
> >
> > -=C2=A0 =C2=A0 switch (qn->kind) {
> > +=C2=A0 =C2=A0 switch (qv->kind) {
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_I64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return g_strdup_printf("%"= PRId64, qn->u.i64);
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return g_strdup_printf("%"= PRId64, qv->u.i64);
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_U64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 return g_strdup_printf("%"= PRIu64, qn->u.u64);
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return g_strdup_printf("%"= PRIu64, qv->u.u64);
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_DOUBLE:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* FIXME: snprintf() is locale = dependent; but JSON requires
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* numbers to be formatted= as if in the C locale. Dependence
> > @@ -189,7 +187,7 @@ char *qnum_to_string(QNum *qn)
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* rounding errors; we sho= uld be using DBL_DECIMAL_DIG (17),
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* and only rounding to a = shorter number if the result would
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* still produce the same = floating point value.=C2=A0 */
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 buffer =3D g_strdup_printf("%f&= quot; , qn->u.dbl);
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 buffer =3D g_strdup_printf("%f&= quot; , qv->u.dbl);
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 len =3D strlen(buffer);
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 while (len > 0 && bu= ffer[len - 1] =3D=3D '0') {
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 len--;
> > @@ -221,8 +219,10 @@ char *qnum_to_string(QNum *qn)
> >=C2=A0 =C2=A0*/
> >=C2=A0 bool qnum_is_equal(const QObject *x, const QObject *y)
> >=C2=A0 {
> > -=C2=A0 =C2=A0 QNum *num_x =3D qobject_to(QNum, x);
> > -=C2=A0 =C2=A0 QNum *num_y =3D qobject_to(QNum, y);
> > +=C2=A0 =C2=A0 const QNum *qnum_x =3D qobject_to(QNum, x);
> > +=C2=A0 =C2=A0 const QNum *qnum_y =3D qobject_to(QNum, y);
> > +=C2=A0 =C2=A0 const QNumValue *num_x =3D &qnum_x->value;<= br> > > +=C2=A0 =C2=A0 const QNumValue *num_y =3D &qnum_y->value;<= br> > >
> >=C2=A0 =C2=A0 =C2=A0 switch (num_x->kind) {
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_I64:
> > diff --git a/tests/check-qnum.c b/tests/check-qnum.c
> > index 4105015872..9499b0d845 100644
> > --- a/tests/check-qnum.c
> > +++ b/tests/check-qnum.c
> > @@ -30,8 +30,8 @@ static void qnum_from_int_test(void)
> >
> >=C2=A0 =C2=A0 =C2=A0 qn =3D qnum_from_int(value);
> >=C2=A0 =C2=A0 =C2=A0 g_assert(qn !=3D NULL);
> > -=C2=A0 =C2=A0 g_assert_cmpint(qn->kind, =3D=3D, QNUM_I64); > > -=C2=A0 =C2=A0 g_assert_cmpint(qn->u.i64, =3D=3D, value);
> > +=C2=A0 =C2=A0 g_assert_cmpint(qn->value.kind, =3D=3D, QNUM_I6= 4);
> > +=C2=A0 =C2=A0 g_assert_cmpint(qn->value.u.i64, =3D=3D, value)= ;
> >=C2=A0 =C2=A0 =C2=A0 g_assert_cmpint(qn->base.refcnt, =3D=3D, 1= );
> >=C2=A0 =C2=A0 =C2=A0 g_assert_cmpint(qobject_type(QOBJECT(qn)), = =3D=3D, QTYPE_QNUM);
> >
> > @@ -45,8 +45,8 @@ static void qnum_from_uint_test(void)
> >
> >=C2=A0 =C2=A0 =C2=A0 qn =3D qnum_from_uint(value);
> >=C2=A0 =C2=A0 =C2=A0 g_assert(qn !=3D NULL);
> > -=C2=A0 =C2=A0 g_assert_cmpint(qn->kind, =3D=3D, QNUM_U64); > > -=C2=A0 =C2=A0 g_assert(qn->u.u64 =3D=3D value);
> > +=C2=A0 =C2=A0 g_assert_cmpint(qn->value.kind, =3D=3D, QNUM_U6= 4);
> > +=C2=A0 =C2=A0 g_assert(qn->value.u.u64 =3D=3D value);
> >=C2=A0 =C2=A0 =C2=A0 g_assert(qn->base.refcnt =3D=3D 1);
> >=C2=A0 =C2=A0 =C2=A0 g_assert(qobject_type(QOBJECT(qn)) =3D=3D QTY= PE_QNUM);
> >
> > @@ -60,8 +60,8 @@ static void qnum_from_double_test(void)
> >
> >=C2=A0 =C2=A0 =C2=A0 qn =3D qnum_from_double(value);
> >=C2=A0 =C2=A0 =C2=A0 g_assert(qn !=3D NULL);
> > -=C2=A0 =C2=A0 g_assert_cmpint(qn->kind, =3D=3D, QNUM_DOUBLE);=
> > -=C2=A0 =C2=A0 g_assert_cmpfloat(qn->u.dbl, =3D=3D, value); > > +=C2=A0 =C2=A0 g_assert_cmpint(qn->value.kind, =3D=3D, QNUM_DO= UBLE);
> > +=C2=A0 =C2=A0 g_assert_cmpfloat(qn->value.u.dbl, =3D=3D, valu= e);
> >=C2=A0 =C2=A0 =C2=A0 g_assert_cmpint(qn->base.refcnt, =3D=3D, 1= );
> >=C2=A0 =C2=A0 =C2=A0 g_assert_cmpint(qobject_type(QOBJECT(qn)), = =3D=3D, QTYPE_QNUM);
> >
> > @@ -74,7 +74,7 @@ static void qnum_from_int64_test(void)
> >=C2=A0 =C2=A0 =C2=A0 const int64_t value =3D 0x1234567890abcdefLL;=
> >
> >=C2=A0 =C2=A0 =C2=A0 qn =3D qnum_from_int(value);
> > -=C2=A0 =C2=A0 g_assert_cmpint((int64_t) qn->u.i64, =3D=3D, va= lue);
> > +=C2=A0 =C2=A0 g_assert_cmpint((int64_t) qn->value.u.i64, =3D= =3D, value);
> >
> >=C2=A0 =C2=A0 =C2=A0 qobject_unref(qn);
> >=C2=A0 }
> > --
> > 2.28.0
> >
> >
> >
> lgtm otherwise

Thanks!

--
Eduardo



--
Marc-Andr=C3=A9 Lureau
--000000000000a4ae8805b44ebb2f--