Message ID | 1596073443-16062-1-git-send-email-hzhou@ovn.org |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev,ovn] expr.c: Fix argument type of expr_write_scope(). | expand |
Hi Han,
Changes look fine.
Acked-by: Ankur Sharma <ankur.sharma@nutanix.com>
Regards,
Ankur
On Wed, Jul 29, 2020 at 9:03 PM Ankur Sharma <ankur.sharma@nutanix.com> wrote: > > Hi Han, > > Changes look fine. > > Acked-by: Ankur Sharma <ankur.sharma@nutanix.com> > > Regards, > Ankur Thanks Ankur, I applied this to master. > ________________________________ > From: dev <ovs-dev-bounces@openvswitch.org> on behalf of Han Zhou < hzhou@ovn.org> > Sent: Wednesday, July 29, 2020 6:44 PM > To: dev@openvswitch.org <dev@openvswitch.org> > Cc: Han Zhou <hzhou@ovn.org> > Subject: [ovs-dev] [PATCH ovn] expr.c: Fix argument type of expr_write_scope(). > > There is compile error introduced by the commit 2054d01247. > *** > ../lib/expr.c:3328:6: error: symbol 'expr_type_check' redeclared with different > type (originally declared at ../include/ovn/expr.h:481) - incompatible argument > 4 (different signedness) > Makefile:1971: recipe for target 'lib/expr.lo' failed > *** > > Fixes: 2054d01247 ("Add expression writeability scopes.") > Signed-off-by: Han Zhou <hzhou@ovn.org> > --- > lib/expr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/expr.c b/lib/expr.c > index c07e7dd..6fb9675 100644 > --- a/lib/expr.c > +++ b/lib/expr.c > @@ -3327,7 +3327,7 @@ expr_evaluate(const struct expr *e, const struct flow *uflow, > * must free(). */ > char * OVS_WARN_UNUSED_RESULT > expr_type_check(const struct expr_field *f, int n_bits, bool rw, > - uint32_t write_scope) > + enum expr_write_scope write_scope) > { > if (n_bits != f->n_bits) { > if (n_bits && f->n_bits) { > -- > 2.1.0 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=s883GpUCOChKOHiocYtGcg&r=mZwX9gFQgeJHzTg-68aCJgsODyUEVsHGFOfL90J6MJY&m=6Hq4Iu6-qDZ2r4dRyx_Qw-HEpTmmqfEEJO5Chyck7Bs&s=8TfuSpbakHFWk34kNULN61Hyg4Z4qCeCA49VZ-T83E0&e=
On Thu, Jul 30, 2020 at 9:58 AM Han Zhou <hzhou@ovn.org> wrote: > On Wed, Jul 29, 2020 at 9:03 PM Ankur Sharma <ankur.sharma@nutanix.com> > wrote: > > > > Hi Han, > > > > Changes look fine. > > > > Acked-by: Ankur Sharma <ankur.sharma@nutanix.com> > > > > Regards, > > Ankur > > Thanks Ankur, I applied this to master. > > > ________________________________ > > From: dev <ovs-dev-bounces@openvswitch.org> on behalf of Han Zhou < > hzhou@ovn.org> > > Sent: Wednesday, July 29, 2020 6:44 PM > > To: dev@openvswitch.org <dev@openvswitch.org> > > Cc: Han Zhou <hzhou@ovn.org> > > Subject: [ovs-dev] [PATCH ovn] expr.c: Fix argument type of > expr_write_scope(). > > > > There is compile error introduced by the commit 2054d01247. > > *** > > ../lib/expr.c:3328:6: error: symbol 'expr_type_check' redeclared with > different > > type (originally declared at ../include/ovn/expr.h:481) - incompatible > argument > > 4 (different signedness) > > Makefile:1971: recipe for target 'lib/expr.lo' failed > > *** > Thanks for the fix Han. I'm surprised I didn't see the error. Probably due to different gcc and clang versions. I've below versions installed on my fedora 32. gcc (GCC) 10.1.1 20200507 (Red Hat 10.1.1-1) clang version 10.0.0 (Fedora 10.0.0-1.fc32) Thanks Numan > > > > Fixes: 2054d01247 ("Add expression writeability scopes.") > > Signed-off-by: Han Zhou <hzhou@ovn.org> > > --- > > lib/expr.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/lib/expr.c b/lib/expr.c > > index c07e7dd..6fb9675 100644 > > --- a/lib/expr.c > > +++ b/lib/expr.c > > @@ -3327,7 +3327,7 @@ expr_evaluate(const struct expr *e, const struct > flow *uflow, > > * must free(). */ > > char * OVS_WARN_UNUSED_RESULT > > expr_type_check(const struct expr_field *f, int n_bits, bool rw, > > - uint32_t write_scope) > > + enum expr_write_scope write_scope) > > { > > if (n_bits != f->n_bits) { > > if (n_bits && f->n_bits) { > > -- > > 2.1.0 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > > > https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=s883GpUCOChKOHiocYtGcg&r=mZwX9gFQgeJHzTg-68aCJgsODyUEVsHGFOfL90J6MJY&m=6Hq4Iu6-qDZ2r4dRyx_Qw-HEpTmmqfEEJO5Chyck7Bs&s=8TfuSpbakHFWk34kNULN61Hyg4Z4qCeCA49VZ-T83E0&e= > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > >
On Wed, Jul 29, 2020 at 10:21 PM Numan Siddique <numans@ovn.org> wrote: > > > On Thu, Jul 30, 2020 at 9:58 AM Han Zhou <hzhou@ovn.org> wrote: > >> On Wed, Jul 29, 2020 at 9:03 PM Ankur Sharma <ankur.sharma@nutanix.com> >> wrote: >> > >> > Hi Han, >> > >> > Changes look fine. >> > >> > Acked-by: Ankur Sharma <ankur.sharma@nutanix.com> >> > >> > Regards, >> > Ankur >> >> Thanks Ankur, I applied this to master. >> >> > ________________________________ >> > From: dev <ovs-dev-bounces@openvswitch.org> on behalf of Han Zhou < >> hzhou@ovn.org> >> > Sent: Wednesday, July 29, 2020 6:44 PM >> > To: dev@openvswitch.org <dev@openvswitch.org> >> > Cc: Han Zhou <hzhou@ovn.org> >> > Subject: [ovs-dev] [PATCH ovn] expr.c: Fix argument type of >> expr_write_scope(). >> > >> > There is compile error introduced by the commit 2054d01247. >> > *** >> > ../lib/expr.c:3328:6: error: symbol 'expr_type_check' redeclared with >> different >> > type (originally declared at ../include/ovn/expr.h:481) - incompatible >> argument >> > 4 (different signedness) >> > Makefile:1971: recipe for target 'lib/expr.lo' failed >> > *** >> > > > Thanks for the fix Han. I'm surprised I didn't see the error. > Probably due to different gcc and clang versions. > > I've below versions installed on my fedora 32. > > gcc (GCC) 10.1.1 20200507 (Red Hat 10.1.1-1) > clang version 10.0.0 (Fedora 10.0.0-1.fc32) > > Thanks > Numan > > Yes this happens sometimes. My gcc is older than you but I enabled --enable-sparse. Not sure if this mattered. > >> > >> > Fixes: 2054d01247 ("Add expression writeability scopes.") >> > Signed-off-by: Han Zhou <hzhou@ovn.org> >> > --- >> > lib/expr.c | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/lib/expr.c b/lib/expr.c >> > index c07e7dd..6fb9675 100644 >> > --- a/lib/expr.c >> > +++ b/lib/expr.c >> > @@ -3327,7 +3327,7 @@ expr_evaluate(const struct expr *e, const struct >> flow *uflow, >> > * must free(). */ >> > char * OVS_WARN_UNUSED_RESULT >> > expr_type_check(const struct expr_field *f, int n_bits, bool rw, >> > - uint32_t write_scope) >> > + enum expr_write_scope write_scope) >> > { >> > if (n_bits != f->n_bits) { >> > if (n_bits && f->n_bits) { >> > -- >> > 2.1.0 >> > >> > _______________________________________________ >> > dev mailing list >> > dev@openvswitch.org >> > >> >> https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=s883GpUCOChKOHiocYtGcg&r=mZwX9gFQgeJHzTg-68aCJgsODyUEVsHGFOfL90J6MJY&m=6Hq4Iu6-qDZ2r4dRyx_Qw-HEpTmmqfEEJO5Chyck7Bs&s=8TfuSpbakHFWk34kNULN61Hyg4Z4qCeCA49VZ-T83E0&e= >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >>
Thanks, Han. I guess I need to upgrade gcc since I didn't see this locally. On 7/29/20 9:44 PM, Han Zhou wrote: > There is compile error introduced by the commit 2054d01247. > *** > ../lib/expr.c:3328:6: error: symbol 'expr_type_check' redeclared with different > type (originally declared at ../include/ovn/expr.h:481) - incompatible argument > 4 (different signedness) > Makefile:1971: recipe for target 'lib/expr.lo' failed > *** > > Fixes: 2054d01247 ("Add expression writeability scopes.") > Signed-off-by: Han Zhou <hzhou@ovn.org> > --- > lib/expr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/expr.c b/lib/expr.c > index c07e7dd..6fb9675 100644 > --- a/lib/expr.c > +++ b/lib/expr.c > @@ -3327,7 +3327,7 @@ expr_evaluate(const struct expr *e, const struct flow *uflow, > * must free(). */ > char * OVS_WARN_UNUSED_RESULT > expr_type_check(const struct expr_field *f, int n_bits, bool rw, > - uint32_t write_scope) > + enum expr_write_scope write_scope) > { > if (n_bits != f->n_bits) { > if (n_bits && f->n_bits) { >
diff --git a/lib/expr.c b/lib/expr.c index c07e7dd..6fb9675 100644 --- a/lib/expr.c +++ b/lib/expr.c @@ -3327,7 +3327,7 @@ expr_evaluate(const struct expr *e, const struct flow *uflow, * must free(). */ char * OVS_WARN_UNUSED_RESULT expr_type_check(const struct expr_field *f, int n_bits, bool rw, - uint32_t write_scope) + enum expr_write_scope write_scope) { if (n_bits != f->n_bits) { if (n_bits && f->n_bits) {
There is compile error introduced by the commit 2054d01247. *** ../lib/expr.c:3328:6: error: symbol 'expr_type_check' redeclared with different type (originally declared at ../include/ovn/expr.h:481) - incompatible argument 4 (different signedness) Makefile:1971: recipe for target 'lib/expr.lo' failed *** Fixes: 2054d01247 ("Add expression writeability scopes.") Signed-off-by: Han Zhou <hzhou@ovn.org> --- lib/expr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)