From: Greg Kurz <groug@kaod.org>
To: Laurent Vivier <lvivier@redhat.com>
Cc: david@gibson.dropbear.id.au, thuth@redhat.com,
qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v5 1/3] qtest: replace strtoXX() by qemu_strtoXX()
Date: Thu, 8 Sep 2016 11:53:25 +0200 [thread overview]
Message-ID: <20160908115325.1e42e8c8@bahia> (raw)
In-Reply-To: <1473323434-4945-2-git-send-email-lvivier@redhat.com>
On Thu, 8 Sep 2016 10:30:32 +0200
Laurent Vivier <lvivier@redhat.com> wrote:
> Check the result of qemu_strtoXX() and assert
> if the string cannot be converted.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
Reviewed-by: Greg Kurz <groug@kaod.org>
> v5:
> - update log message about result checking
> - add David's Rb
>
> v4:
> - add this patch in the series to change all strtoXX() in qtest.c
>
> qtest.c | 49 ++++++++++++++++++++++++++-----------------------
> 1 file changed, 26 insertions(+), 23 deletions(-)
>
> diff --git a/qtest.c b/qtest.c
> index da4826c..4c94708 100644
> --- a/qtest.c
> +++ b/qtest.c
> @@ -27,6 +27,7 @@
> #include "qemu/config-file.h"
> #include "qemu/option.h"
> #include "qemu/error-report.h"
> +#include "qemu/cutils.h"
>
> #define MAX_IRQ 256
>
> @@ -324,12 +325,13 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> } else if (strcmp(words[0], "outb") == 0 ||
> strcmp(words[0], "outw") == 0 ||
> strcmp(words[0], "outl") == 0) {
> - uint16_t addr;
> - uint32_t value;
> + unsigned long addr;
> + unsigned long value;
>
> g_assert(words[1] && words[2]);
> - addr = strtoul(words[1], NULL, 0);
> - value = strtoul(words[2], NULL, 0);
> + g_assert(qemu_strtoul(words[1], NULL, 0, &addr) == 0);
> + g_assert(qemu_strtoul(words[2], NULL, 0, &value) == 0);
> + g_assert(addr <= 0xffff);
>
> if (words[0][3] == 'b') {
> cpu_outb(addr, value);
> @@ -343,11 +345,12 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> } else if (strcmp(words[0], "inb") == 0 ||
> strcmp(words[0], "inw") == 0 ||
> strcmp(words[0], "inl") == 0) {
> - uint16_t addr;
> + unsigned long addr;
> uint32_t value = -1U;
>
> g_assert(words[1]);
> - addr = strtoul(words[1], NULL, 0);
> + g_assert(qemu_strtoul(words[1], NULL, 0, &addr) == 0);
> + g_assert(addr <= 0xffff);
>
> if (words[0][2] == 'b') {
> value = cpu_inb(addr);
> @@ -366,8 +369,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> uint64_t value;
>
> g_assert(words[1] && words[2]);
> - addr = strtoull(words[1], NULL, 0);
> - value = strtoull(words[2], NULL, 0);
> + g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0);
> + g_assert(qemu_strtoull(words[2], NULL, 0, &value) == 0);
>
> if (words[0][5] == 'b') {
> uint8_t data = value;
> @@ -395,7 +398,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> uint64_t value = UINT64_C(-1);
>
> g_assert(words[1]);
> - addr = strtoull(words[1], NULL, 0);
> + g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0);
>
> if (words[0][4] == 'b') {
> uint8_t data;
> @@ -421,8 +424,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> char *enc;
>
> g_assert(words[1] && words[2]);
> - addr = strtoull(words[1], NULL, 0);
> - len = strtoull(words[2], NULL, 0);
> + g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0);
> + g_assert(qemu_strtoull(words[2], NULL, 0, &len) == 0);
>
> data = g_malloc(len);
> cpu_physical_memory_read(addr, data, len);
> @@ -443,8 +446,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> gchar *b64_data;
>
> g_assert(words[1] && words[2]);
> - addr = strtoull(words[1], NULL, 0);
> - len = strtoull(words[2], NULL, 0);
> + g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0);
> + g_assert(qemu_strtoull(words[2], NULL, 0, &len) == 0);
>
> data = g_malloc(len);
> cpu_physical_memory_read(addr, data, len);
> @@ -460,8 +463,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> size_t data_len;
>
> g_assert(words[1] && words[2] && words[3]);
> - addr = strtoull(words[1], NULL, 0);
> - len = strtoull(words[2], NULL, 0);
> + g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0);
> + g_assert(qemu_strtoull(words[2], NULL, 0, &len) == 0);
>
> data_len = strlen(words[3]);
> if (data_len < 3) {
> @@ -486,12 +489,12 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> } else if (strcmp(words[0], "memset") == 0) {
> uint64_t addr, len;
> uint8_t *data;
> - uint8_t pattern;
> + unsigned long pattern;
>
> g_assert(words[1] && words[2] && words[3]);
> - addr = strtoull(words[1], NULL, 0);
> - len = strtoull(words[2], NULL, 0);
> - pattern = strtoull(words[3], NULL, 0);
> + g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0);
> + g_assert(qemu_strtoull(words[2], NULL, 0, &len) == 0);
> + g_assert(qemu_strtoul(words[3], NULL, 0, &pattern) == 0);
>
> data = g_malloc(len);
> memset(data, pattern, len);
> @@ -507,8 +510,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> gsize out_len;
>
> g_assert(words[1] && words[2] && words[3]);
> - addr = strtoull(words[1], NULL, 0);
> - len = strtoull(words[2], NULL, 0);
> + g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0);
> + g_assert(qemu_strtoull(words[2], NULL, 0, &len) == 0);
>
> data_len = strlen(words[3]);
> if (data_len < 3) {
> @@ -532,7 +535,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> int64_t ns;
>
> if (words[1]) {
> - ns = strtoll(words[1], NULL, 0);
> + g_assert(qemu_strtoll(words[1], NULL, 0, &ns) == 0);
> } else {
> ns = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL);
> }
> @@ -544,7 +547,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
> int64_t ns;
>
> g_assert(words[1]);
> - ns = strtoll(words[1], NULL, 0);
> + g_assert(qemu_strtoll(words[1], NULL, 0, &ns) == 0);
> qtest_clock_warp(ns);
> qtest_send_prefix(chr);
> qtest_sendf(chr, "OK %"PRIi64"\n",
next prev parent reply other threads:[~2016-09-08 9:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 8:30 [Qemu-devel] [PATCH v5 0/3] tests: add RTAS protocol Laurent Vivier
2016-09-08 8:30 ` [Qemu-devel] [PATCH v5 1/3] qtest: replace strtoXX() by qemu_strtoXX() Laurent Vivier
2016-09-08 9:53 ` Greg Kurz [this message]
2016-09-08 8:30 ` [Qemu-devel] [PATCH v5 2/3] libqos: define SPAPR libqos functions Laurent Vivier
2016-09-08 17:47 ` Greg Kurz
2016-09-08 8:30 ` [Qemu-devel] [PATCH v5 3/3] tests: add RTAS command in the protocol Laurent Vivier
2016-09-08 17:53 ` [Qemu-devel] [Qemu-ppc] " Greg Kurz
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=20160908115325.1e42e8c8@bahia \
--to=groug@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=lvivier@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=thuth@redhat.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).