Message ID | 1360600914-5448-2-git-send-email-afaerber@suse.de |
---|---|
State | New |
Headers | show |
Am 11.02.2013 17:41, schrieb Andreas Färber: > On 32-bit hosts, unsigned long may be uint32_t and uint64_t may be > unsigned long long. Account for this by always using strtoull(). > We were already using strtoll() for int64_t. > > Signed-off-by: Andreas Färber <afaerber@suse.de> Sorry, this one was Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Andreas > --- > qtest.c | 8 ++++---- > 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) > > diff --git a/qtest.c b/qtest.c > index b7a3821..4663a38 100644 > --- a/qtest.c > +++ b/qtest.c > @@ -282,8 +282,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) > uint8_t *data; > > g_assert(words[1] && words[2]); > - addr = strtoul(words[1], NULL, 0); > - len = strtoul(words[2], NULL, 0); > + addr = strtoull(words[1], NULL, 0); > + len = strtoull(words[2], NULL, 0); > > data = g_malloc(len); > cpu_physical_memory_read(addr, data, len); > @@ -302,8 +302,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) > size_t data_len; > > g_assert(words[1] && words[2] && words[3]); > - addr = strtoul(words[1], NULL, 0); > - len = strtoul(words[2], NULL, 0); > + addr = strtoull(words[1], NULL, 0); > + len = strtoull(words[2], NULL, 0); > > data_len = strlen(words[3]); > if (data_len < 3) { >
diff --git a/qtest.c b/qtest.c index b7a3821..4663a38 100644 --- a/qtest.c +++ b/qtest.c @@ -282,8 +282,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) uint8_t *data; g_assert(words[1] && words[2]); - addr = strtoul(words[1], NULL, 0); - len = strtoul(words[2], NULL, 0); + addr = strtoull(words[1], NULL, 0); + len = strtoull(words[2], NULL, 0); data = g_malloc(len); cpu_physical_memory_read(addr, data, len); @@ -302,8 +302,8 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) size_t data_len; g_assert(words[1] && words[2] && words[3]); - addr = strtoul(words[1], NULL, 0); - len = strtoul(words[2], NULL, 0); + addr = strtoull(words[1], NULL, 0); + len = strtoull(words[2], NULL, 0); data_len = strlen(words[3]); if (data_len < 3) {
On 32-bit hosts, unsigned long may be uint32_t and uint64_t may be unsigned long long. Account for this by always using strtoull(). We were already using strtoll() for int64_t. Signed-off-by: Andreas Färber <afaerber@suse.de> --- qtest.c | 8 ++++---- 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)