{"id":812481,"url":"http://patchwork.ozlabs.org/api/patches/812481/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-7-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170911172022.4738-7-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-11T17:19:50","name":"[v7,06/38] libqtest: Use qemu_strtoul()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a21e3f4884a5f3deb17445d70e805d59e586eb21","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-7-eblake@redhat.com/mbox/","series":[{"id":2534,"url":"http://patchwork.ozlabs.org/api/series/2534/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2534","date":"2017-09-11T17:19:47","name":"Preliminary libqtest cleanups","version":7,"mbox":"http://patchwork.ozlabs.org/series/2534/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812481/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812481/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrZlL1fJgz9s81\n\tfor ;\n\tTue, 12 Sep 2017 03:33:18 +1000 (AEST)","from localhost ([::1]:59380 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drSaC-0001lE-9Q\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 13:33:16 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38168)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drSNz-0006wY-9w\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:20:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drSNy-0000ze-9t\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:20:39 -0400","from mx1.redhat.com ([209.132.183.28]:39304)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1drSNy-0000zL-4A\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:20:38 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 32F5A85363\n\tfor ; Mon, 11 Sep 2017 17:20:37 +0000 (UTC)","from red.redhat.com (ovpn-120-44.rdu2.redhat.com [10.10.120.44])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5CADC5D9CA;\n\tMon, 11 Sep 2017 17:20:36 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 32F5A85363","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 12:19:50 -0500","Message-Id":"<20170911172022.4738-7-eblake@redhat.com>","In-Reply-To":"<20170911172022.4738-1-eblake@redhat.com>","References":"<20170911172022.4738-1-eblake@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tMon, 11 Sep 2017 17:20:37 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 06/38] libqtest: Use qemu_strtoul()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, thuth@redhat.com, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This will keep checkpatch happy when the next patch does code motion.\nFix the include order to match HACKING when adding the needed header.\n\nSigned-off-by: Eric Blake \nReviewed-by: Philippe Mathieu-Daudé \nReviewed-by: Thomas Huth \n---\n tests/libqtest.c | 19 +++++++++++++------\n 1 file changed, 13 insertions(+), 6 deletions(-)","diff":"diff --git a/tests/libqtest.c b/tests/libqtest.c\nindex 3f956f09fc..95d4159b38 100644\n--- a/tests/libqtest.c\n+++ b/tests/libqtest.c\n@@ -15,12 +15,13 @@\n *\n */\n #include \"qemu/osdep.h\"\n-#include \"libqtest.h\"\n\n #include \n #include \n #include \n\n+#include \"libqtest.h\"\n+#include \"qemu/cutils.h\"\n #include \"qapi/error.h\"\n #include \"qapi/qmp/json-parser.h\"\n #include \"qapi/qmp/json-streamer.h\"\n@@ -331,12 +332,14 @@ redo:\n g_string_free(line, TRUE);\n\n if (strcmp(words[0], \"IRQ\") == 0) {\n- int irq;\n+ long irq;\n+ int ret;\n\n g_assert(words[1] != NULL);\n g_assert(words[2] != NULL);\n\n- irq = strtoul(words[2], NULL, 0);\n+ ret = qemu_strtol(words[2], NULL, 0, &irq);\n+ g_assert(!ret);\n g_assert_cmpint(irq, >=, 0);\n g_assert_cmpint(irq, <, MAX_IRQ);\n\n@@ -699,11 +702,13 @@ void qtest_outl(QTestState *s, uint16_t addr, uint32_t value)\n static uint32_t qtest_in(QTestState *s, const char *cmd, uint16_t addr)\n {\n gchar **args;\n- uint32_t value;\n+ int ret;\n+ unsigned long value;\n\n qtest_sendf(s, \"%s 0x%x\\n\", cmd, addr);\n args = qtest_rsp(s, 2);\n- value = strtoul(args[1], NULL, 0);\n+ ret = qemu_strtoul(args[1], NULL, 0, &value);\n+ g_assert(!ret && value <= UINT32_MAX);\n g_strfreev(args);\n\n return value;\n@@ -754,11 +759,13 @@ void qtest_writeq(QTestState *s, uint64_t addr, uint64_t value)\n static uint64_t qtest_read(QTestState *s, const char *cmd, uint64_t addr)\n {\n gchar **args;\n+ int ret;\n uint64_t value;\n\n qtest_sendf(s, \"%s 0x%\" PRIx64 \"\\n\", cmd, addr);\n args = qtest_rsp(s, 2);\n- value = strtoull(args[1], NULL, 0);\n+ ret = qemu_strtou64(args[1], NULL, 0, &value);\n+ g_assert(!ret);\n g_strfreev(args);\n\n return value;\n","prefixes":["v7","06/38"]}