From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhuB4-0000bE-I0 for qemu-devel@nongnu.org; Thu, 08 Sep 2016 03:55:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhuB1-0002wr-Gc for qemu-devel@nongnu.org; Thu, 08 Sep 2016 03:55:18 -0400 Received: from 10.mo68.mail-out.ovh.net ([46.105.79.203]:51101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhuB1-0002wg-89 for qemu-devel@nongnu.org; Thu, 08 Sep 2016 03:55:15 -0400 Received: from player778.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id 4234BFF9B30 for ; Thu, 8 Sep 2016 09:55:14 +0200 (CEST) Date: Thu, 8 Sep 2016 09:55:06 +0200 From: Greg Kurz Message-ID: <20160908095506.3ecd07be@bahia> In-Reply-To: <1473167877-2545-2-git-send-email-lvivier@redhat.com> References: <1473167877-2545-1-git-send-email-lvivier@redhat.com> <1473167877-2545-2-git-send-email-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH v4 1/3] qtest: replace strtoXX() by qemu_strtoXX() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier Cc: david@gibson.dropbear.id.au, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On Tue, 6 Sep 2016 15:17:55 +0200 Laurent Vivier wrote: > Signed-off-by: Laurent Vivier > --- FWIW, Reviewed-by: Greg Kurz > 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",