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=-7.5 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_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 459B4C2D0E4 for ; Tue, 17 Nov 2020 17:00:27 +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 9432E22447 for ; Tue, 17 Nov 2020 17:00:26 +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="mt2GXHB3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9432E22447 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]:43598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf4LB-0005Qf-C2 for qemu-devel@archiver.kernel.org; Tue, 17 Nov 2020 12:00:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf4EZ-0002QL-Kz for qemu-devel@nongnu.org; Tue, 17 Nov 2020 11:53:35 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:39452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kf4EW-00077r-OT for qemu-devel@nongnu.org; Tue, 17 Nov 2020 11:53:35 -0500 Received: by mail-ej1-x643.google.com with SMTP id s25so30383777ejy.6 for ; Tue, 17 Nov 2020 08:53:32 -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=7428R+oR0lGYl7J4nUR6BeZwcrYbFQnKX3t9FLn/kmg=; b=mt2GXHB35AWclUA/snqtOkVyRKChzf4tsjWJS8DTvZJhX+PxnUSaboO7N/IgMkbHfj M/vygk32pu509TDsnsgXwTMtxc8+Sh5xX9CHPVAv1BfBaOIDcTzpfRarwmSoE+0tdy7b 1ol6etWFnEPiUobDfnlPRXqEM0TgyNJvgM5rXfbBoekGr9gIg5Dqde26S1/7gc/Yt/uk q1SQ5Nv0EtW/eB+D/CKBA6RVxuYW4Ukg7VDocFD1PnxNd1PWeTsGPIH3Dyx5skh8L2uR Q2uYS5QeQjbd9mqq27Ql2en/RLyp9btSvWWnCct+n3aynWAALXsiWLrsAhTiBw/DCY2m tzFQ== 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=7428R+oR0lGYl7J4nUR6BeZwcrYbFQnKX3t9FLn/kmg=; b=M61BfyQP8QXXdI7wvZWG8wQ0e9GFBIMZHxt2900nYl6VlM3qpmSXzqWPu/JkDXzVpl Uzofd38zufXY5kWoKyN4p0a/5Rl0bR9kEzVxOj6JUOG5GYH61j/ZmG2MfzbitKiHMq0w yAIulN+zwnwmSjkp8X6DITq8RfDDDCf/KN4wRyTYccVUS6dPpu/iMyWLWottQnvdsFo5 6bGkpS/L8uj/k/d16i5uxut9Un1G3mS6JOVzWJARUJ05Nd7M5r8Y2yxUYvqnz8TN3wCj Uo01SiUpqF5SQueIEEHxNXFFEVVc/Uy3QekKNJOxFhJhHsyfwj+jJY1UJYxG9byxbGQ0 ONzw== X-Gm-Message-State: AOAM530TAonUJ/lyd8ir6aVDLP4vlaTBVNDzO84oO0KZ/A7xYIKGPgXd pKEXEEBySTQ9HvZrMA0IbBFM4UIHOWr0CoamGeI= X-Google-Smtp-Source: ABdhPJwPIfdXR3CtGZjXfkNM7Q8IOqqE+fDuHEEpj8yU+s6yXl8ipsm1PLV2mGyhHOXbXPV/DVmkNSot9uEjnUU7pwg= X-Received: by 2002:a17:906:bcd4:: with SMTP id lw20mr19730122ejb.527.1605632011446; Tue, 17 Nov 2020 08:53:31 -0800 (PST) MIME-Version: 1.0 References: <20201116224143.1284278-1-ehabkost@redhat.com> <20201116224143.1284278-5-ehabkost@redhat.com> <20201117154940.GG1235237@habkost.net> In-Reply-To: <20201117154940.GG1235237@habkost.net> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Tue, 17 Nov 2020 20:53:19 +0400 Message-ID: Subject: Re: [PATCH v2 4/8] qnum: qnum_value_is_equal() function To: Eduardo Habkost Content-Type: multipart/alternative; boundary="000000000000aeb10a05b4505513" Received-SPF: pass client-ip=2a00:1450:4864:20::643; envelope-from=marcandre.lureau@gmail.com; helo=mail-ej1-x643.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" --000000000000aeb10a05b4505513 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Nov 17, 2020 at 7:49 PM Eduardo Habkost wrote= : > On Tue, Nov 17, 2020 at 12:42:47PM +0400, Marc-Andr=C3=A9 Lureau wrote: > > On Tue, Nov 17, 2020 at 2:42 AM Eduardo Habkost > wrote: > > > > > Extract the QNum value comparison logic to a function that takes > > > QNumValue* as argument. > > > > > > Signed-off-by: Eduardo Habkost > > > --- > > > include/qapi/qmp/qnum.h | 1 + > > > qobject/qnum.c | 29 +++++++++++++++++++---------- > > > 2 files changed, 20 insertions(+), 10 deletions(-) > > > > > > diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h > > > index 62fbdfda68..0327ecd0f0 100644 > > > --- a/include/qapi/qmp/qnum.h > > > +++ b/include/qapi/qmp/qnum.h > > > @@ -106,6 +106,7 @@ double qnum_get_double(const QNum *qn); > > > > > > char *qnum_to_string(QNum *qn); > > > > > > +bool qnum_value_is_equal(const QNumValue *num_x, const QNumValue > *num_y); > > > bool qnum_is_equal(const QObject *x, const QObject *y); > > > void qnum_destroy_obj(QObject *obj); > > > > > > diff --git a/qobject/qnum.c b/qobject/qnum.c > > > index f80d4efd76..6a0f948b16 100644 > > > --- a/qobject/qnum.c > > > +++ b/qobject/qnum.c > > > @@ -207,9 +207,9 @@ char *qnum_to_string(QNum *qn) > > > } > > > > > > /** > > > - * qnum_is_equal(): Test whether the two QNums are equal > > > - * @x: QNum object > > > - * @y: QNum object > > > + * qnum_value_is_equal(): Test whether two QNumValues are equal > > > + * @num_x: QNum value > > > + * @num_y: QNum value > > > > > > > val_x: a QNumValue ? > > Do you mean: > @num_x: a QNumValue > ? > > I was not planning to rename the existing num_x/num_y variables. > > Not renaming because that would make some churn? But this is already quite confusing, so it's better to use "val" for QNumVal and "num" for QNum I guess. If you don't want to rename it in the code, may I suggest doing it at the declaration side? Not sure it's a better idea. > > > > * > > > * Negative integers are never considered equal to unsigned integers= , > > > * but positive integers in the range [0, INT64_MAX] are considered > > > @@ -217,13 +217,8 @@ char *qnum_to_string(QNum *qn) > > > * > > > * Doubles are never considered equal to integers. > > > */ > > > -bool qnum_is_equal(const QObject *x, const QObject *y) > > > +bool qnum_value_is_equal(const QNumValue *num_x, const QNumValue > *num_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: > > > switch (num_y->kind) { > > > @@ -241,7 +236,7 @@ bool qnum_is_equal(const QObject *x, const QObjec= t > *y) > > > case QNUM_U64: > > > switch (num_y->kind) { > > > case QNUM_I64: > > > - return qnum_is_equal(y, x); > > > + return qnum_value_is_equal(num_y, num_x); > > > case QNUM_U64: > > > /* Comparison in native uint64_t type */ > > > return num_x->u.u64 =3D=3D num_y->u.u64; > > > @@ -264,6 +259,20 @@ bool qnum_is_equal(const QObject *x, const > QObject *y) > > > abort(); > > > } > > > > > > +/** > > > + * qnum_is_equal(): Test whether the two QNums are equal > > > + * @x: QNum object > > > + * @y: QNum object > > > + * > > > + * See qnum_value_is_equal() for details on the comparison rules. > > > + */ > > > +bool qnum_is_equal(const QObject *x, const QObject *y) > > > +{ > > > + const QNum *qnum_x =3D qobject_to(QNum, x); > > > + const QNum *qnum_y =3D qobject_to(QNum, y); > > > + return qnum_value_is_equal(&qnum_x->value, &qnum_y->value); > > > +} > > > + > > > /** > > > * qnum_destroy_obj(): Free all memory allocated by a QNum object > > > * > > > -- > > > 2.28.0 > > > > > > > > > > > beside that, > > Reviewed-by: Marc-Andr=C3=A9 Lureau > > Thanks! > > -- > Eduardo > > --=20 Marc-Andr=C3=A9 Lureau --000000000000aeb10a05b4505513 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Nov 17, 2020 at 7:49 PM Eduar= do Habkost <ehabkost@redhat.com> wrote:
On= Tue, Nov 17, 2020 at 12:42:47PM +0400, Marc-Andr=C3=A9 Lureau wrote:
> On Tue, Nov 17, 2020 at 2:42 AM Eduardo Habkost <ehabkost@redhat.com> wrote: >
> > Extract the QNum value comparison logic to a function that takes<= br> > > QNumValue* as argument.
> >
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > ---
> >=C2=A0 include/qapi/qmp/qnum.h |=C2=A0 1 +
> >=C2=A0 qobject/qnum.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 29 +++++= ++++++++++++++----------
> >=C2=A0 2 files changed, 20 insertions(+), 10 deletions(-)
> >
> > diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h > > index 62fbdfda68..0327ecd0f0 100644
> > --- a/include/qapi/qmp/qnum.h
> > +++ b/include/qapi/qmp/qnum.h
> > @@ -106,6 +106,7 @@ double qnum_get_double(const QNum *qn);
> >
> >=C2=A0 char *qnum_to_string(QNum *qn);
> >
> > +bool qnum_value_is_equal(const QNumValue *num_x, const QNumValue= *num_y);
> >=C2=A0 bool qnum_is_equal(const QObject *x, const QObject *y);
> >=C2=A0 void qnum_destroy_obj(QObject *obj);
> >
> > diff --git a/qobject/qnum.c b/qobject/qnum.c
> > index f80d4efd76..6a0f948b16 100644
> > --- a/qobject/qnum.c
> > +++ b/qobject/qnum.c
> > @@ -207,9 +207,9 @@ char *qnum_to_string(QNum *qn)
> >=C2=A0 }
> >
> >=C2=A0 /**
> > - * qnum_is_equal(): Test whether the two QNums are equal
> > - * @x: QNum object
> > - * @y: QNum object
> > + * qnum_value_is_equal(): Test whether two QNumValues are equal<= br> > > + * @num_x: QNum value
> > + * @num_y: QNum value
> >
>
> val_x: a QNumValue ?

Do you mean:
=C2=A0 @num_x: a QNumValue
?

I was not planning to rename the existing num_x/num_y variables.


Not renaming because that would make s= ome churn? But this is already quite confusing, so it's better to use &= quot;val" for QNumVal and "num" for QNum I guess.
=
If you don't want to rename it in the code, may I sugges= t doing it at the declaration side? Not sure it's a better idea.
=C2=A0
>
>=C2=A0 =C2=A0*
> >=C2=A0 =C2=A0* Negative integers are never considered equal to uns= igned integers,
> >=C2=A0 =C2=A0* but positive integers in the range [0, INT64_MAX] a= re considered
> > @@ -217,13 +217,8 @@ char *qnum_to_string(QNum *qn)
> >=C2=A0 =C2=A0*
> >=C2=A0 =C2=A0* Doubles are never considered equal to integers.
> >=C2=A0 =C2=A0*/
> > -bool qnum_is_equal(const QObject *x, const QObject *y)
> > +bool qnum_value_is_equal(const QNumValue *num_x, const QNumValue= *num_y)
> >=C2=A0 {
> > -=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:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 switch (num_y->kind) {
> > @@ -241,7 +236,7 @@ bool qnum_is_equal(const QObject *x, const QO= bject *y)
> >=C2=A0 =C2=A0 =C2=A0 case QNUM_U64:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 switch (num_y->kind) {
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 case QNUM_I64:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return qnum_is_equal(y= , x);
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return qnum_value_is_e= qual(num_y, num_x);
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 case QNUM_U64:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Comparison in = native uint64_t type */
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return num_x->= u.u64 =3D=3D num_y->u.u64;
> > @@ -264,6 +259,20 @@ bool qnum_is_equal(const QObject *x, const Q= Object *y)
> >=C2=A0 =C2=A0 =C2=A0 abort();
> >=C2=A0 }
> >
> > +/**
> > + * qnum_is_equal(): Test whether the two QNums are equal
> > + * @x: QNum object
> > + * @y: QNum object
> > + *
> > + * See qnum_value_is_equal() for details on the comparison rules= .
> > + */
> > +bool qnum_is_equal(const QObject *x, const QObject *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 return qnum_value_is_equal(&qnum_x->value, = &qnum_y->value);
> > +}
> > +
> >=C2=A0 /**
> >=C2=A0 =C2=A0* qnum_destroy_obj(): Free all memory allocated by a = QNum object
> >=C2=A0 =C2=A0*
> > --
> > 2.28.0
> >
> >
> >
> beside that,
> Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>

Thanks!

--
Eduardo



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