Minor integer parsing improvements
cover Minor integer parsing improvements
Not for 4.2, of course.
Markus Armbruster (2):
util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
test-keyval: Tighten test of trailing crap after size
tests/test-keyval.c | 2 +- util/cutils.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/2 util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
qemu_strtoi64() assumes int64_t is long long. This is marked FIXME. Replace by a QEMU_BUILD_BUG_ON() to avoid surprises.
Same for qemu_strtou64().
Fix a typo in qemu_strtoul()'s contract while there.
--- util/cutils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
util/cutils.c +5 -3
@@ -502,7 +502,7 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base,* Convert string @nptr to an int64_t. * * Works like qemu_strtol(), except it stores INT64_MAX on overflow, -* and INT_MIN on underflow. +* and INT64_MIN on underflow. */ int qemu_strtoi64 (const char *nptr,const char **endptr,int base,int64_t *result)
@@ -517,8 +517,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base,return -EINVAL ; } +/* This assumes int64_t is long long TODO relax */ +QEMU_BUILD_BUG_ON (sizeof (int64_t ) !=sizeof (long long )); errno =0 ; -/* FIXME This assumes int64_t is long long */ *result =strtoll (nptr, &ep, base);return check_strtox_error (nptr, ep, endptr, errno); }
@@ -541,8 +542,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,return -EINVAL ; } +/* This assumes uint64_t is unsigned long long TODO relax */ +QEMU_BUILD_BUG_ON (sizeof (uint64_t ) !=sizeof (unsigned long long )); errno =0 ; -/* FIXME This assumes uint64_t is unsigned long long */ *result =strtoull (nptr, &ep, base);/* Windows returns 1 for negative out-of-range values. */ if (errno ==ERANGE ) {
Signature · 1 line
2.21.0
Re: [PATCH 1/2] util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
Quoted 26 lines · Markus Armbruster
qemu_strtoi64()assumesint64_tis long long. This is marked FIXME. Replace by aQEMU_BUILD_BUG_ON()to avoid surprises.Same for
qemu_strtou64().Fix a typo in qemu_strtoul()'s contract while there.
Signed-off-by Markus Armbruster <[email protected]>--- util/cutils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)util/cutils.c +1
-1@@ -502,7 +502,7 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base,* Convert string @nptr to an int64_t. * * Works like qemu_strtol(), except it stores INT64_MAX on overflow, -* and INT_MIN on underflow. +* and INT64_MIN on underflow. */ int qemu_strtoi64 (const char *nptr,const char **endptr,int base,int64_t *result)
util/cutils.c int qemu_strtoi64(const char *nptr, const char **endptr, int base, · line 521
Quoted 5 lines
util/cutils.c +2
-0@@ -517,8 +517,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base,return -EINVAL ; } +/* This assumes int64_t is long long TODO relax */ +QEMU_BUILD_BUG_ON (sizeof (int64_t ) !=sizeof (long long ));
Ready for 128-bit!
Quoted 17 lines
util/cutils.c +2
-2errno =0 ; -/* FIXME This assumes int64_t is long long */ *result =strtoll (nptr, &ep, base);return check_strtox_error (nptr, ep, endptr, errno); }@@ -541,8 +542,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,return -EINVAL ; } +/* This assumes uint64_t is unsigned long long TODO relax */ +QEMU_BUILD_BUG_ON (sizeof (uint64_t ) !=sizeof (unsigned long long )); errno =0 ; -/* FIXME This assumes uint64_t is unsigned long long */ *result =strtoull (nptr, &ep, base);/* Windows returns 1 for negative out-of-range values. */ if (errno ==ERANGE ) {
Laurent Vivier
AppliedRe: [PATCH 1/2] util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
In reply to Markus ArmbrusterLe 25/11/2019 à 14:38, Markus Armbruster a écrit :
Quoted 38 lines
qemu_strtoi64()assumesint64_tis long long. This is marked FIXME. Replace by aQEMU_BUILD_BUG_ON()to avoid surprises.Same for
qemu_strtou64().Fix a typo in qemu_strtoul()'s contract while there.
Signed-off-by Markus Armbruster <[email protected]>--- util/cutils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)util/cutils.c +3
-2@@ -502,7 +502,7 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base,* Convert string @nptr to an int64_t. * * Works like qemu_strtol(), except it stores INT64_MAX on overflow, -* and INT_MIN on underflow. +* and INT64_MIN on underflow. */ int qemu_strtoi64 (const char *nptr,const char **endptr,int base,int64_t *result)@@ -517,8 +517,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base,return -EINVAL ; } +/* This assumes int64_t is long long TODO relax */ +QEMU_BUILD_BUG_ON (sizeof (int64_t ) !=sizeof (long long )); errno =0 ; -/* FIXME This assumes int64_t is long long */ *result =strtoll (nptr, &ep, base);return check_strtox_error (nptr, ep, endptr, errno); }
util/cutils.c int qemu_strtou64(const char *nptr, const char **endptr, int base, · line 550
Quoted 10 lines
util/cutils.c +2
-1@@ -541,8 +542,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,return -EINVAL ; } +/* This assumes uint64_t is unsigned long long TODO relax */ +QEMU_BUILD_BUG_ON (sizeof (uint64_t ) !=sizeof (unsigned long long )); errno =0 ; -/* FIXME This assumes uint64_t is unsigned long long */ *result =strtoull (nptr, &ep, base);/* Windows returns 1 for negative out-of-range values. */ if (errno ==ERANGE ) {
Applied to my trivial-patches branch with removed trailing whitespace.
Thanks,
Laurent
PATCH 2/2 test-keyval: Tighten test of trailing crap after size
In reply to Markus Armbrustertest_keyval_visit_size() should test for trailing crap after size with and without suffix. It does test the latter: "sz2=16Gi" has size "16G" followed by crap "i". It fails to test the former "sz1=16E" is a syntactically valid size that overflows uint64_t. Replace by "sz1=0Z".
--- tests/test-keyval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/test-keyval.c +1 -1
@@ -478,7 +478,7 @@ static void test_keyval_visit_size(void)visit_free (v);/* Trailing crap */ - qdict =keyval_parse ("sz1=16E,sz2=16Gi" ,NULL , &error_abort); + qdict =keyval_parse ("sz1=0Z,sz2=16Gi" ,NULL , &error_abort); v =qobject_input_visitor_new_keyval (QOBJECT (qdict));qobject_unref (qdict);visit_start_struct (v,NULL ,NULL ,0 , &error_abort);
Signature · 1 line
2.21.0
Re: [PATCH 2/2] test-keyval: Tighten test of trailing crap after size
Quoted 16 lines · Markus Armbruster
test_keyval_visit_size()should test for trailing crap after size with and without suffix. It does test the latter: "sz2=16Gi" has size "16G" followed by crap "i". It fails to test the former "sz1=16E" is a syntactically valid size that overflowsuint64_t. Replace by "sz1=0Z".Signed-off-by Markus Armbruster <[email protected]>--- tests/test-keyval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/test-keyval.c +0
-0
tests/test-keyval.c static void test_keyval_visit_size(void) · line 481
Quoted 5 lines
tests/test-keyval.c +1
-1@@ -478,7 +478,7 @@ static void test_keyval_visit_size(void)visit_free (v);/* Trailing crap */ - qdict =keyval_parse ("sz1=16E,sz2=16Gi" ,NULL , &error_abort); + qdict =keyval_parse ("sz1=0Z,sz2=16Gi" ,NULL , &error_abort);
Does this actually test both failure cases, or does it abort the parse after the first failure (sz1=0Z) without ever hitting the second half of the parse (sz2=16Gi)?
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH 2/2] test-keyval: Tighten test of trailing crap after size
Quoted 12 lines · Eric Blake
Quoted 11 lines · Markus Armbruster
test_keyval_visit_size()should test for trailing crap after size with and without suffix. It does test the latter: "sz2=16Gi" has size "16G" followed by crap "i". It fails to test the former "sz1=16E" is a syntactically valid size that overflowsuint64_t. Replace by "sz1=0Z".Signed-off-by Markus Armbruster <[email protected]>--- tests/test-keyval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
tests/test-keyval.c static void test_keyval_visit_size(void) · line 480
Quoted 9 lines
tests/test-keyval.c +1
-1@@ -478,7 +478,7 @@ static void test_keyval_visit_size(void)visit_free (v);/* Trailing crap */ - qdict =keyval_parse ("sz1=16E,sz2=16Gi" ,NULL , &error_abort); + qdict =keyval_parse ("sz1=0Z,sz2=16Gi" ,NULL , &error_abort);Does this actually test both failure cases, or does it abort the parse after the first failure (sz1=0Z) without ever hitting the second half of the parse (sz2=16Gi)?
Fair question! Short answer: yes, we check both.
Long answer follows.
/* Trailing crap */
qdict = keyval_parse("time1=89ks,time2=ns", NULL, &error_abort);keyval_parse() must succeed: it takes &error_abort.
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
qobject_unref(qdict);Can't fail.
visit_start_struct(v, NULL, NULL, 0, &error_abort);
Must succeed.
visit_type_size(v, "sz1", &sz, &err);
error_free_or_abort(&err);This is where we parse "0Z". Must fail. We continue.
visit_type_size(v, "sz2", &sz, &err);
error_free_or_abort(&err);This is where we parse "16Gi". Must fail. We continue.
visit_end_struct(v, NULL);
visit_free(v);
}Clear now?
Eric Blake
Reviewed-byRe: [PATCH 2/2] test-keyval: Tighten test of trailing crap after size
Quoted 14 lines · Markus Armbruster
Quoted 12 lines · Eric Blake
Quoted 10 lines · Markus Armbruster
test_keyval_visit_size()should test for trailing crap after size with and without suffix. It does test the latter: "sz2=16Gi" has size "16G" followed by crap "i". It fails to test the former "sz1=16E" is a syntactically valid size that overflowsuint64_t. Replace by "sz1=0Z"./* Trailing crap */tests/test-keyval.c +1
-1- qdict =keyval_parse ("sz1=16E,sz2=16Gi" ,NULL , &error_abort); + qdict =keyval_parse ("sz1=0Z,sz2=16Gi" ,NULL , &error_abort);
Quoted 5 lines
Quoted 3 lines
Does this actually test both failure cases, or does it abort the parse after the first failure (sz1=0Z) without ever hitting the second half of the parse (sz2=16Gi)?
Fair question! Short answer: yes, we check both.
Aha - keyval_parse() just sets up the parser, while the check for double failures is in the test code below.
Quoted 1 line
Clear now?
Yes.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Laurent Vivier
AppliedRe: [PATCH 2/2] test-keyval: Tighten test of trailing crap after size
In reply to Markus ArmbrusterLe 25/11/2019 à 14:38, Markus Armbruster a écrit :
Quoted 17 lines
test_keyval_visit_size()should test for trailing crap after size with and without suffix. It does test the latter: "sz2=16Gi" has size "16G" followed by crap "i". It fails to test the former "sz1=16E" is a syntactically valid size that overflowsuint64_t. Replace by "sz1=0Z".Signed-off-by Markus Armbruster <[email protected]>--- tests/test-keyval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/test-keyval.c +0
-0
tests/test-keyval.c static void test_keyval_visit_size(void) · line 484
Quoted 8 lines
tests/test-keyval.c +1
-1@@ -478,7 +478,7 @@ static void test_keyval_visit_size(void)visit_free (v);/* Trailing crap */ - qdict =keyval_parse ("sz1=16E,sz2=16Gi" ,NULL , &error_abort); + qdict =keyval_parse ("sz1=0Z,sz2=16Gi" ,NULL , &error_abort); v =qobject_input_visitor_new_keyval (QOBJECT (qdict));qobject_unref (qdict);visit_start_struct (v,NULL ,NULL ,0 , &error_abort);
Applied to my trivial-patches branch.
Thanks,
Laurent
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH 0/2] Minor integer parsing improvements
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
f4a50eb test-keyval: Tighten test of trailing crap after size 1b74bc5 util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
=== OUTPUT BEGIN ===
1/2 Checking commit 1b74bc5bc45a (util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON())
ERROR: trailing whitespace
#35: FILE: util/cutils.c:523:
+ QEMU_BUILD_BUG_ON(sizeof(int64_t) != sizeof(long long)); $
total: 1 errors, 0 warnings, 28 lines checked
Patch 1/2 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/2 Checking commit f4a50eb158af (test-keyval: Tighten test of trailing crap after size) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]