From: "Alex Bennée" <alex.bennee@linaro.org>
To: Wei Yang <richardw.yang@linux.intel.com>
Cc: kwolf@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org,
jasowang@redhat.com, richard.henderson@linaro.org,
dgilbert@redhat.com, mreitz@redhat.com
Subject: Re: [PATCH 1/2] tests/tcg/multiarch: fix code style in function main of test-mmap.c
Date: Mon, 11 Nov 2019 10:25:43 +0000 [thread overview]
Message-ID: <87bltiaevs.fsf@linaro.org> (raw)
In-Reply-To: <20191015031350.4345-2-richardw.yang@linux.intel.com>
Wei Yang <richardw.yang@linux.intel.com> writes:
> This file uses quite a different code style and changing just one line
> would leads to some awkward appearance.
>
> This is a preparation for the following replacement of
> sysconf(_SC_PAGESIZE).
>
> BTW, to depress ERROR message from checkpatch.pl, this patch replaces
> strtoul with qemu_strtoul.
NACK I'm afraid.
The tests/tcg directory all build against glibc only to make them easier
to cross-compile for the various targets. If you run check-tcg and have
a non-native cross compiler setup you'll notice this fails to build:
BUILD aarch64-linux-user guest-tests with aarch64-linux-gnu-gcc
/home/alex/lsrc/qemu.git/tests/tcg/multiarch/test-mmap.c: In function ‘main’:
/home/alex/lsrc/qemu.git/tests/tcg/multiarch/test-mmap.c:467:9: warning: implicit declaration of function ‘qemu_strtoul’; did you mean ‘strtoul’? [-Wimplicit-function-declaration]
qemu_strtoul(argv[1], NULL, 0, &pagesize);
^~~~~~~~~~~~
strtoul
/home/alex/lsrc/qemu.git/tests/tcg/multiarch/test-mmap.c:469:20: error: ‘qemu_real_host_page_size’ undeclared (first use in this function)
pagesize = qemu_real_host_page_size;
^~~~~~~~~~~~~~~~~~~~~~~~
/home/alex/lsrc/qemu.git/tests/tcg/multiarch/test-mmap.c:469:20: note: each undeclared identifier is reported only once for each function it appears in
make[2]: *** [../Makefile.target:103: test-mmap] Error 1
make[1]: *** [/home/alex/lsrc/qemu.git/tests/tcg/Makefile.qemu:33: cross-build-guest-tests] Error 2
make: *** [/home/alex/lsrc/qemu.git/tests/Makefile.include:1094: build-tcg-tests-aarch64-linux-user] Error 2
make: *** Waiting for unfinished jobs....
>
> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
> ---
> tests/tcg/multiarch/test-mmap.c | 67 ++++++++++++++++++---------------
> 1 file changed, 36 insertions(+), 31 deletions(-)
>
> diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mmap.c
> index 11d0e777b1..9ea49e2307 100644
> --- a/tests/tcg/multiarch/test-mmap.c
> +++ b/tests/tcg/multiarch/test-mmap.c
> @@ -456,49 +456,54 @@ void check_invalid_mmaps(void)
>
> int main(int argc, char **argv)
> {
> - char tempname[] = "/tmp/.cmmapXXXXXX";
> - unsigned int i;
> -
> - /* Trust the first argument, otherwise probe the system for our
> - pagesize. */
> - if (argc > 1)
> - pagesize = strtoul(argv[1], NULL, 0);
> - else
> - pagesize = sysconf(_SC_PAGESIZE);
> + char tempname[] = "/tmp/.cmmapXXXXXX";
> + unsigned int i;
> +
> + /*
> + * Trust the first argument, otherwise probe the system for our
> + * pagesize.
> + */
> + if (argc > 1) {
> + qemu_strtoul(argv[1], NULL, 0, &pagesize);
> + } else {
> + pagesize = sysconf(_SC_PAGESIZE);
> + }
>
> - /* Assume pagesize is a power of two. */
> - pagemask = pagesize - 1;
> - dummybuf = malloc (pagesize);
> - printf ("pagesize=%u pagemask=%x\n", pagesize, pagemask);
> + /* Assume pagesize is a power of two. */
> + pagemask = pagesize - 1;
> + dummybuf = malloc(pagesize);
> + printf("pagesize=%u pagemask=%x\n", pagesize, pagemask);
>
> - test_fd = mkstemp(tempname);
> - unlink(tempname);
> + test_fd = mkstemp(tempname);
> + unlink(tempname);
>
> - /* Fill the file with int's counting from zero and up. */
> + /* Fill the file with int's counting from zero and up. */
> for (i = 0; i < (pagesize * 4) / sizeof i; i++) {
> checked_write(test_fd, &i, sizeof i);
> }
>
> - /* Append a few extra writes to make the file end at non
> - page boundary. */
> + /*
> + * Append a few extra writes to make the file end at non
> + * page boundary.
> + */
> checked_write(test_fd, &i, sizeof i); i++;
> checked_write(test_fd, &i, sizeof i); i++;
> checked_write(test_fd, &i, sizeof i); i++;
>
> - test_fsize = lseek(test_fd, 0, SEEK_CUR);
> + test_fsize = lseek(test_fd, 0, SEEK_CUR);
>
> - /* Run the tests. */
> - check_aligned_anonymous_unfixed_mmaps();
> - check_aligned_anonymous_unfixed_colliding_mmaps();
> - check_aligned_anonymous_fixed_mmaps();
> - check_file_unfixed_mmaps();
> - check_file_fixed_mmaps();
> - check_file_fixed_eof_mmaps();
> - check_file_unfixed_eof_mmaps();
> - check_invalid_mmaps();
> + /* Run the tests. */
> + check_aligned_anonymous_unfixed_mmaps();
> + check_aligned_anonymous_unfixed_colliding_mmaps();
> + check_aligned_anonymous_fixed_mmaps();
> + check_file_unfixed_mmaps();
> + check_file_fixed_mmaps();
> + check_file_fixed_eof_mmaps();
> + check_file_unfixed_eof_mmaps();
> + check_invalid_mmaps();
>
> - /* Fails at the moment. */
> - /* check_aligned_anonymous_fixed_mmaps_collide_with_host(); */
> + /* Fails at the moment. */
> + /* check_aligned_anonymous_fixed_mmaps_collide_with_host(); */
>
> - return EXIT_SUCCESS;
> + return EXIT_SUCCESS;
> }
--
Alex Bennée
next prev parent reply other threads:[~2019-11-11 10:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 3:13 [PATCH 0/2] replace sysconf(_SC_PAGESIZE) with qemu_real_host_page_size Wei Yang
2019-10-15 3:13 ` [PATCH 1/2] tests/tcg/multiarch: fix code style in function main of test-mmap.c Wei Yang
2019-11-11 9:57 ` Stefano Garzarella
2019-11-11 10:25 ` Alex Bennée [this message]
2019-11-11 15:47 ` Wei Yang
2019-11-11 16:00 ` Alex Bennée
2019-10-15 3:13 ` [PATCH 2/2] core: replace sysconf(_SC_PAGESIZE) with qemu_real_host_page_size Wei Yang
2019-11-11 10:06 ` Stefano Garzarella
2019-11-11 15:46 ` Wei Yang
2019-11-09 1:25 ` [PATCH 0/2] " Wei Yang
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=87bltiaevs.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=dgilbert@redhat.com \
--cc=jasowang@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=richardw.yang@linux.intel.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 NNTP newsgroup(s).