falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libqtest: Use qemu_strtoul() 

This will keep checkpatch happy when the next patch does code motion.
Fix the include order to match HACKING when adding the needed header.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Eric Blake 2017-09-11 12:19:50 -05:00 committed by Thomas Huth
parent 2c58c27bee
commit 50990b162c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/libqtest.c
View File

@ -15,12 +15,13 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "libqtest.h"
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/un.h> #include <sys/un.h>
#include "libqtest.h"
#include "qemu/cutils.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-parser.h"
#include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-streamer.h"
@ -363,12 +364,14 @@ redo:
g_string_free(line, TRUE); g_string_free(line, TRUE);
if (strcmp(words[0], "IRQ") == 0) { if (strcmp(words[0], "IRQ") == 0) {
int irq; long irq;
int ret;
g_assert(words[1] != NULL); g_assert(words[1] != NULL);
g_assert(words[2] != NULL); g_assert(words[2] != NULL);
irq = strtoul(words[2], NULL, 0); ret = qemu_strtol(words[2], NULL, 0, &irq);
g_assert(!ret);
g_assert_cmpint(irq, >=, 0); g_assert_cmpint(irq, >=, 0);
g_assert_cmpint(irq, <, MAX_IRQ); g_assert_cmpint(irq, <, MAX_IRQ);
@ -730,11 +733,13 @@ void qtest_outl(QTestState *s, uint16_t addr, uint32_t value)
static uint32_t qtest_in(QTestState *s, const char *cmd, uint16_t addr) static uint32_t qtest_in(QTestState *s, const char *cmd, uint16_t addr)
{ {
gchar **args; gchar **args;
uint32_t value; int ret;
unsigned long value;
qtest_sendf(s, "%s 0x%x\n", cmd, addr); qtest_sendf(s, "%s 0x%x\n", cmd, addr);
args = qtest_rsp(s, 2); args = qtest_rsp(s, 2);
value = strtoul(args[1], NULL, 0); ret = qemu_strtoul(args[1], NULL, 0, &value);
g_assert(!ret && value <= UINT32_MAX);
g_strfreev(args); g_strfreev(args);
return value; return value;
@ -785,11 +790,13 @@ void qtest_writeq(QTestState *s, uint64_t addr, uint64_t value)
static uint64_t qtest_read(QTestState *s, const char *cmd, uint64_t addr) static uint64_t qtest_read(QTestState *s, const char *cmd, uint64_t addr)
{ {
gchar **args; gchar **args;
int ret;
uint64_t value; uint64_t value;
qtest_sendf(s, "%s 0x%" PRIx64 "\n", cmd, addr); qtest_sendf(s, "%s 0x%" PRIx64 "\n", cmd, addr);
args = qtest_rsp(s, 2); args = qtest_rsp(s, 2);
value = strtoull(args[1], NULL, 0); ret = qemu_strtou64(args[1], NULL, 0, &value);
g_assert(!ret);
g_strfreev(args); g_strfreev(args);
return value; return value;