2007-01-08 01:04:40 +03:00
|
|
|
/*
|
|
|
|
* Simple C functions to supplement the C library
|
2007-09-17 01:08:06 +04:00
|
|
|
*
|
2007-01-08 01:04:40 +03:00
|
|
|
* Copyright (c) 2006 Fabrice Bellard
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
2007-11-11 05:51:17 +03:00
|
|
|
#include "qemu-common.h"
|
2008-12-04 23:08:06 +03:00
|
|
|
#include "host-utils.h"
|
2010-10-21 19:15:46 +04:00
|
|
|
#include <math.h>
|
2007-01-08 01:04:40 +03:00
|
|
|
|
|
|
|
void pstrcpy(char *buf, int buf_size, const char *str)
|
|
|
|
{
|
|
|
|
int c;
|
|
|
|
char *q = buf;
|
|
|
|
|
|
|
|
if (buf_size <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for(;;) {
|
|
|
|
c = *str++;
|
|
|
|
if (c == 0 || q >= buf + buf_size - 1)
|
|
|
|
break;
|
|
|
|
*q++ = c;
|
|
|
|
}
|
|
|
|
*q = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* strcat and truncate. */
|
|
|
|
char *pstrcat(char *buf, int buf_size, const char *s)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
len = strlen(buf);
|
2007-09-17 01:08:06 +04:00
|
|
|
if (len < buf_size)
|
2007-01-08 01:04:40 +03:00
|
|
|
pstrcpy(buf + len, buf_size - len, s);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
int strstart(const char *str, const char *val, const char **ptr)
|
|
|
|
{
|
|
|
|
const char *p, *q;
|
|
|
|
p = str;
|
|
|
|
q = val;
|
|
|
|
while (*q != '\0') {
|
|
|
|
if (*p != *q)
|
|
|
|
return 0;
|
|
|
|
p++;
|
|
|
|
q++;
|
|
|
|
}
|
|
|
|
if (ptr)
|
|
|
|
*ptr = p;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int stristart(const char *str, const char *val, const char **ptr)
|
|
|
|
{
|
|
|
|
const char *p, *q;
|
|
|
|
p = str;
|
|
|
|
q = val;
|
|
|
|
while (*q != '\0') {
|
2008-11-16 16:53:32 +03:00
|
|
|
if (qemu_toupper(*p) != qemu_toupper(*q))
|
2007-01-08 01:04:40 +03:00
|
|
|
return 0;
|
|
|
|
p++;
|
|
|
|
q++;
|
|
|
|
}
|
|
|
|
if (ptr)
|
|
|
|
*ptr = p;
|
|
|
|
return 1;
|
|
|
|
}
|
2007-11-10 22:36:39 +03:00
|
|
|
|
2009-07-01 22:24:44 +04:00
|
|
|
/* XXX: use host strnlen if available ? */
|
|
|
|
int qemu_strnlen(const char *s, int max_len)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < max_len; i++) {
|
|
|
|
if (s[i] == '\0') {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2007-11-10 22:36:39 +03:00
|
|
|
time_t mktimegm(struct tm *tm)
|
|
|
|
{
|
|
|
|
time_t t;
|
|
|
|
int y = tm->tm_year + 1900, m = tm->tm_mon + 1, d = tm->tm_mday;
|
|
|
|
if (m < 3) {
|
|
|
|
m += 12;
|
|
|
|
y--;
|
|
|
|
}
|
|
|
|
t = 86400 * (d + (153 * m - 457) / 5 + 365 * y + y / 4 - y / 100 +
|
|
|
|
y / 400 - 719469);
|
|
|
|
t += 3600 * tm->tm_hour + 60 * tm->tm_min + tm->tm_sec;
|
|
|
|
return t;
|
|
|
|
}
|
2008-12-04 22:19:45 +03:00
|
|
|
|
2008-12-11 22:37:54 +03:00
|
|
|
int qemu_fls(int i)
|
2008-12-04 22:19:45 +03:00
|
|
|
{
|
2008-12-04 23:08:06 +03:00
|
|
|
return 32 - clz32(i);
|
2008-12-04 22:19:45 +03:00
|
|
|
}
|
2009-01-22 19:59:20 +03:00
|
|
|
|
2009-09-04 21:01:32 +04:00
|
|
|
/*
|
|
|
|
* Make sure data goes on disk, but if possible do not bother to
|
|
|
|
* write out the inode just for timestamp updates.
|
|
|
|
*
|
|
|
|
* Unfortunately even in 2009 many operating systems do not support
|
|
|
|
* fdatasync and have to fall back to fsync.
|
|
|
|
*/
|
|
|
|
int qemu_fdatasync(int fd)
|
|
|
|
{
|
2009-09-20 10:56:26 +04:00
|
|
|
#ifdef CONFIG_FDATASYNC
|
2009-09-04 21:01:32 +04:00
|
|
|
return fdatasync(fd);
|
|
|
|
#else
|
|
|
|
return fsync(fd);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2009-01-22 19:59:20 +03:00
|
|
|
/* io vectors */
|
|
|
|
|
|
|
|
void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint)
|
|
|
|
{
|
2011-08-21 07:09:37 +04:00
|
|
|
qiov->iov = g_malloc(alloc_hint * sizeof(struct iovec));
|
2009-01-22 19:59:20 +03:00
|
|
|
qiov->niov = 0;
|
|
|
|
qiov->nalloc = alloc_hint;
|
2009-01-26 20:17:52 +03:00
|
|
|
qiov->size = 0;
|
2009-01-22 19:59:20 +03:00
|
|
|
}
|
|
|
|
|
2009-03-28 20:46:10 +03:00
|
|
|
void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
qiov->iov = iov;
|
|
|
|
qiov->niov = niov;
|
|
|
|
qiov->nalloc = -1;
|
|
|
|
qiov->size = 0;
|
|
|
|
for (i = 0; i < niov; i++)
|
|
|
|
qiov->size += iov[i].iov_len;
|
|
|
|
}
|
|
|
|
|
2009-01-22 19:59:20 +03:00
|
|
|
void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
|
|
|
|
{
|
2009-03-28 20:46:10 +03:00
|
|
|
assert(qiov->nalloc != -1);
|
|
|
|
|
2009-01-22 19:59:20 +03:00
|
|
|
if (qiov->niov == qiov->nalloc) {
|
|
|
|
qiov->nalloc = 2 * qiov->nalloc + 1;
|
2011-08-21 07:09:37 +04:00
|
|
|
qiov->iov = g_realloc(qiov->iov, qiov->nalloc * sizeof(struct iovec));
|
2009-01-22 19:59:20 +03:00
|
|
|
}
|
|
|
|
qiov->iov[qiov->niov].iov_base = base;
|
|
|
|
qiov->iov[qiov->niov].iov_len = len;
|
2009-01-26 20:17:52 +03:00
|
|
|
qiov->size += len;
|
2009-01-22 19:59:20 +03:00
|
|
|
++qiov->niov;
|
|
|
|
}
|
|
|
|
|
2009-09-09 19:53:37 +04:00
|
|
|
/*
|
2010-09-13 20:06:11 +04:00
|
|
|
* Copies iovecs from src to the end of dst. It starts copying after skipping
|
|
|
|
* the given number of bytes in src and copies until src is completely copied
|
|
|
|
* or the total size of the copied iovec reaches size.The size of the last
|
|
|
|
* copied iovec is changed in order to fit the specified total size if it isn't
|
|
|
|
* a perfect fit already.
|
2009-09-09 19:53:37 +04:00
|
|
|
*/
|
2010-09-13 20:06:11 +04:00
|
|
|
void qemu_iovec_copy(QEMUIOVector *dst, QEMUIOVector *src, uint64_t skip,
|
|
|
|
size_t size)
|
2009-09-09 19:53:37 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
size_t done;
|
2010-09-13 20:06:11 +04:00
|
|
|
void *iov_base;
|
|
|
|
uint64_t iov_len;
|
2009-09-09 19:53:37 +04:00
|
|
|
|
|
|
|
assert(dst->nalloc != -1);
|
|
|
|
|
|
|
|
done = 0;
|
|
|
|
for (i = 0; (i < src->niov) && (done != size); i++) {
|
2010-09-13 20:06:11 +04:00
|
|
|
if (skip >= src->iov[i].iov_len) {
|
|
|
|
/* Skip the whole iov */
|
|
|
|
skip -= src->iov[i].iov_len;
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
/* Skip only part (or nothing) of the iov */
|
|
|
|
iov_base = (uint8_t*) src->iov[i].iov_base + skip;
|
|
|
|
iov_len = src->iov[i].iov_len - skip;
|
|
|
|
skip = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (done + iov_len > size) {
|
|
|
|
qemu_iovec_add(dst, iov_base, size - done);
|
2009-09-09 19:53:37 +04:00
|
|
|
break;
|
|
|
|
} else {
|
2010-09-13 20:06:11 +04:00
|
|
|
qemu_iovec_add(dst, iov_base, iov_len);
|
2009-09-09 19:53:37 +04:00
|
|
|
}
|
2010-09-13 20:06:11 +04:00
|
|
|
done += iov_len;
|
2009-09-09 19:53:37 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-13 20:06:11 +04:00
|
|
|
void qemu_iovec_concat(QEMUIOVector *dst, QEMUIOVector *src, size_t size)
|
|
|
|
{
|
|
|
|
qemu_iovec_copy(dst, src, 0, size);
|
|
|
|
}
|
|
|
|
|
2009-01-22 19:59:20 +03:00
|
|
|
void qemu_iovec_destroy(QEMUIOVector *qiov)
|
|
|
|
{
|
2009-03-28 20:46:10 +03:00
|
|
|
assert(qiov->nalloc != -1);
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(qiov->iov);
|
2009-01-22 19:59:20 +03:00
|
|
|
}
|
|
|
|
|
2009-02-06 00:23:54 +03:00
|
|
|
void qemu_iovec_reset(QEMUIOVector *qiov)
|
|
|
|
{
|
2009-03-28 20:46:10 +03:00
|
|
|
assert(qiov->nalloc != -1);
|
|
|
|
|
2009-02-06 00:23:54 +03:00
|
|
|
qiov->niov = 0;
|
|
|
|
qiov->size = 0;
|
|
|
|
}
|
|
|
|
|
2009-01-22 19:59:20 +03:00
|
|
|
void qemu_iovec_to_buffer(QEMUIOVector *qiov, void *buf)
|
|
|
|
{
|
|
|
|
uint8_t *p = (uint8_t *)buf;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < qiov->niov; ++i) {
|
|
|
|
memcpy(p, qiov->iov[i].iov_base, qiov->iov[i].iov_len);
|
|
|
|
p += qiov->iov[i].iov_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-26 20:17:52 +03:00
|
|
|
void qemu_iovec_from_buffer(QEMUIOVector *qiov, const void *buf, size_t count)
|
2009-01-22 19:59:20 +03:00
|
|
|
{
|
|
|
|
const uint8_t *p = (const uint8_t *)buf;
|
2009-01-26 20:17:52 +03:00
|
|
|
size_t copy;
|
2009-01-22 19:59:20 +03:00
|
|
|
int i;
|
|
|
|
|
2009-01-26 20:17:52 +03:00
|
|
|
for (i = 0; i < qiov->niov && count; ++i) {
|
|
|
|
copy = count;
|
|
|
|
if (copy > qiov->iov[i].iov_len)
|
|
|
|
copy = qiov->iov[i].iov_len;
|
|
|
|
memcpy(qiov->iov[i].iov_base, p, copy);
|
|
|
|
p += copy;
|
|
|
|
count -= copy;
|
2009-01-22 19:59:20 +03:00
|
|
|
}
|
|
|
|
}
|
2010-03-10 13:38:55 +03:00
|
|
|
|
2010-09-13 20:06:11 +04:00
|
|
|
void qemu_iovec_memset(QEMUIOVector *qiov, int c, size_t count)
|
|
|
|
{
|
|
|
|
size_t n;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < qiov->niov && count; ++i) {
|
|
|
|
n = MIN(count, qiov->iov[i].iov_len);
|
|
|
|
memset(qiov->iov[i].iov_base, c, n);
|
|
|
|
count -= n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-03 18:12:49 +03:00
|
|
|
void qemu_iovec_memset_skip(QEMUIOVector *qiov, int c, size_t count,
|
|
|
|
size_t skip)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
size_t done;
|
|
|
|
void *iov_base;
|
|
|
|
uint64_t iov_len;
|
|
|
|
|
|
|
|
done = 0;
|
|
|
|
for (i = 0; (i < qiov->niov) && (done != count); i++) {
|
|
|
|
if (skip >= qiov->iov[i].iov_len) {
|
|
|
|
/* Skip the whole iov */
|
|
|
|
skip -= qiov->iov[i].iov_len;
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
/* Skip only part (or nothing) of the iov */
|
|
|
|
iov_base = (uint8_t*) qiov->iov[i].iov_base + skip;
|
|
|
|
iov_len = qiov->iov[i].iov_len - skip;
|
|
|
|
skip = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (done + iov_len > count) {
|
|
|
|
memset(iov_base, c, count - done);
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
memset(iov_base, c, iov_len);
|
|
|
|
}
|
|
|
|
done += iov_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-10 13:38:55 +03:00
|
|
|
#ifndef _WIN32
|
|
|
|
/* Sets a specific flag */
|
|
|
|
int fcntl_setfl(int fd, int flag)
|
|
|
|
{
|
|
|
|
int flags;
|
|
|
|
|
|
|
|
flags = fcntl(fd, F_GETFL);
|
|
|
|
if (flags == -1)
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
if (fcntl(fd, F_SETFL, flags | flag) == -1)
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
cutils: Make strtosz & friends leave follow set to callers
strtosz() & friends require the size to be at the end of the string,
or be followed by whitespace or ','. I find this surprising, because
the name suggests it works like strtol().
The check simplifies callers that accept exactly that follow set
slightly. No such callers exist.
The check is redundant for callers that accept a smaller follow set,
and thus need to check themselves anyway. Right now, this is the case
for all but one caller. All of them neglected to check, or checked
incorrectly, but the previous few commits fixed them up.
Finally, the check is problematic for callers that accept a larger
follow set. This is the case in monitor_parse_command().
Fortunately, the problems there are relatively harmless.
monitor_parse_command() uses strtosz() for argument type 'o'. When
the last argument is of type 'o', a trailing ',' is diagnosed
differently than other trailing junk:
(qemu) migrate_set_speed 1x
invalid size
(qemu) migrate_set_speed 1,
migrate_set_speed: extraneous characters at the end of line
A related inconsistency exists with non-last arguments. No such
command exists, but let's use memsave to explore the inconsistency.
The monitor permits, but does not require whitespace between
arguments. For instance, "memsave (1-1)1024foo" is parsed as command
memsave with three arguments 0, 1024 and "foo". Yes, this is daft,
but at least it's consistently daft.
If I change memsave's second argument from 'i' to 'o', then "memsave
(1-1)1foo" is rejected, because the size is followed by an 'f'. But
"memsave (1-1)1," is still accepted, and duly saves to file ",".
We don't have any users of strtosz that profit from the check. In the
users we have, it appears to encourage sloppy error checking, or gets
in the way. Drop the bothersome check.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-11-22 12:46:06 +04:00
|
|
|
static int64_t suffix_mul(char suffix, int64_t unit)
|
|
|
|
{
|
|
|
|
switch (qemu_toupper(suffix)) {
|
|
|
|
case STRTOSZ_DEFSUFFIX_B:
|
|
|
|
return 1;
|
|
|
|
case STRTOSZ_DEFSUFFIX_KB:
|
|
|
|
return unit;
|
|
|
|
case STRTOSZ_DEFSUFFIX_MB:
|
|
|
|
return unit * unit;
|
|
|
|
case STRTOSZ_DEFSUFFIX_GB:
|
|
|
|
return unit * unit * unit;
|
|
|
|
case STRTOSZ_DEFSUFFIX_TB:
|
|
|
|
return unit * unit * unit * unit;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2010-10-21 19:15:46 +04:00
|
|
|
/*
|
|
|
|
* Convert string to bytes, allowing either B/b for bytes, K/k for KB,
|
2011-11-22 12:46:01 +04:00
|
|
|
* M/m for MB, G/g for GB or T/t for TB. End pointer will be returned
|
cutils: Make strtosz & friends leave follow set to callers
strtosz() & friends require the size to be at the end of the string,
or be followed by whitespace or ','. I find this surprising, because
the name suggests it works like strtol().
The check simplifies callers that accept exactly that follow set
slightly. No such callers exist.
The check is redundant for callers that accept a smaller follow set,
and thus need to check themselves anyway. Right now, this is the case
for all but one caller. All of them neglected to check, or checked
incorrectly, but the previous few commits fixed them up.
Finally, the check is problematic for callers that accept a larger
follow set. This is the case in monitor_parse_command().
Fortunately, the problems there are relatively harmless.
monitor_parse_command() uses strtosz() for argument type 'o'. When
the last argument is of type 'o', a trailing ',' is diagnosed
differently than other trailing junk:
(qemu) migrate_set_speed 1x
invalid size
(qemu) migrate_set_speed 1,
migrate_set_speed: extraneous characters at the end of line
A related inconsistency exists with non-last arguments. No such
command exists, but let's use memsave to explore the inconsistency.
The monitor permits, but does not require whitespace between
arguments. For instance, "memsave (1-1)1024foo" is parsed as command
memsave with three arguments 0, 1024 and "foo". Yes, this is daft,
but at least it's consistently daft.
If I change memsave's second argument from 'i' to 'o', then "memsave
(1-1)1foo" is rejected, because the size is followed by an 'f'. But
"memsave (1-1)1," is still accepted, and duly saves to file ",".
We don't have any users of strtosz that profit from the check. In the
users we have, it appears to encourage sloppy error checking, or gets
in the way. Drop the bothersome check.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-11-22 12:46:06 +04:00
|
|
|
* in *end, if not NULL. Return -1 on error.
|
2010-10-21 19:15:46 +04:00
|
|
|
*/
|
2011-07-07 18:13:11 +04:00
|
|
|
int64_t strtosz_suffix_unit(const char *nptr, char **end,
|
|
|
|
const char default_suffix, int64_t unit)
|
2010-10-21 19:15:46 +04:00
|
|
|
{
|
2011-01-05 13:41:02 +03:00
|
|
|
int64_t retval = -1;
|
2011-01-24 18:33:28 +03:00
|
|
|
char *endptr;
|
cutils: Make strtosz & friends leave follow set to callers
strtosz() & friends require the size to be at the end of the string,
or be followed by whitespace or ','. I find this surprising, because
the name suggests it works like strtol().
The check simplifies callers that accept exactly that follow set
slightly. No such callers exist.
The check is redundant for callers that accept a smaller follow set,
and thus need to check themselves anyway. Right now, this is the case
for all but one caller. All of them neglected to check, or checked
incorrectly, but the previous few commits fixed them up.
Finally, the check is problematic for callers that accept a larger
follow set. This is the case in monitor_parse_command().
Fortunately, the problems there are relatively harmless.
monitor_parse_command() uses strtosz() for argument type 'o'. When
the last argument is of type 'o', a trailing ',' is diagnosed
differently than other trailing junk:
(qemu) migrate_set_speed 1x
invalid size
(qemu) migrate_set_speed 1,
migrate_set_speed: extraneous characters at the end of line
A related inconsistency exists with non-last arguments. No such
command exists, but let's use memsave to explore the inconsistency.
The monitor permits, but does not require whitespace between
arguments. For instance, "memsave (1-1)1024foo" is parsed as command
memsave with three arguments 0, 1024 and "foo". Yes, this is daft,
but at least it's consistently daft.
If I change memsave's second argument from 'i' to 'o', then "memsave
(1-1)1foo" is rejected, because the size is followed by an 'f'. But
"memsave (1-1)1," is still accepted, and duly saves to file ",".
We don't have any users of strtosz that profit from the check. In the
users we have, it appears to encourage sloppy error checking, or gets
in the way. Drop the bothersome check.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-11-22 12:46:06 +04:00
|
|
|
unsigned char c;
|
2010-10-21 19:15:46 +04:00
|
|
|
int mul_required = 0;
|
|
|
|
double val, mul, integral, fraction;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
val = strtod(nptr, &endptr);
|
|
|
|
if (isnan(val) || endptr == nptr || errno != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
2011-01-24 18:33:30 +03:00
|
|
|
fraction = modf(val, &integral);
|
|
|
|
if (fraction != 0) {
|
2010-10-21 19:15:46 +04:00
|
|
|
mul_required = 1;
|
|
|
|
}
|
|
|
|
c = *endptr;
|
cutils: Make strtosz & friends leave follow set to callers
strtosz() & friends require the size to be at the end of the string,
or be followed by whitespace or ','. I find this surprising, because
the name suggests it works like strtol().
The check simplifies callers that accept exactly that follow set
slightly. No such callers exist.
The check is redundant for callers that accept a smaller follow set,
and thus need to check themselves anyway. Right now, this is the case
for all but one caller. All of them neglected to check, or checked
incorrectly, but the previous few commits fixed them up.
Finally, the check is problematic for callers that accept a larger
follow set. This is the case in monitor_parse_command().
Fortunately, the problems there are relatively harmless.
monitor_parse_command() uses strtosz() for argument type 'o'. When
the last argument is of type 'o', a trailing ',' is diagnosed
differently than other trailing junk:
(qemu) migrate_set_speed 1x
invalid size
(qemu) migrate_set_speed 1,
migrate_set_speed: extraneous characters at the end of line
A related inconsistency exists with non-last arguments. No such
command exists, but let's use memsave to explore the inconsistency.
The monitor permits, but does not require whitespace between
arguments. For instance, "memsave (1-1)1024foo" is parsed as command
memsave with three arguments 0, 1024 and "foo". Yes, this is daft,
but at least it's consistently daft.
If I change memsave's second argument from 'i' to 'o', then "memsave
(1-1)1foo" is rejected, because the size is followed by an 'f'. But
"memsave (1-1)1," is still accepted, and duly saves to file ",".
We don't have any users of strtosz that profit from the check. In the
users we have, it appears to encourage sloppy error checking, or gets
in the way. Drop the bothersome check.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-11-22 12:46:06 +04:00
|
|
|
mul = suffix_mul(c, unit);
|
|
|
|
if (mul >= 0) {
|
|
|
|
endptr++;
|
|
|
|
} else {
|
|
|
|
mul = suffix_mul(default_suffix, unit);
|
|
|
|
assert(mul >= 0);
|
2010-10-21 19:15:46 +04:00
|
|
|
}
|
cutils: Make strtosz & friends leave follow set to callers
strtosz() & friends require the size to be at the end of the string,
or be followed by whitespace or ','. I find this surprising, because
the name suggests it works like strtol().
The check simplifies callers that accept exactly that follow set
slightly. No such callers exist.
The check is redundant for callers that accept a smaller follow set,
and thus need to check themselves anyway. Right now, this is the case
for all but one caller. All of them neglected to check, or checked
incorrectly, but the previous few commits fixed them up.
Finally, the check is problematic for callers that accept a larger
follow set. This is the case in monitor_parse_command().
Fortunately, the problems there are relatively harmless.
monitor_parse_command() uses strtosz() for argument type 'o'. When
the last argument is of type 'o', a trailing ',' is diagnosed
differently than other trailing junk:
(qemu) migrate_set_speed 1x
invalid size
(qemu) migrate_set_speed 1,
migrate_set_speed: extraneous characters at the end of line
A related inconsistency exists with non-last arguments. No such
command exists, but let's use memsave to explore the inconsistency.
The monitor permits, but does not require whitespace between
arguments. For instance, "memsave (1-1)1024foo" is parsed as command
memsave with three arguments 0, 1024 and "foo". Yes, this is daft,
but at least it's consistently daft.
If I change memsave's second argument from 'i' to 'o', then "memsave
(1-1)1foo" is rejected, because the size is followed by an 'f'. But
"memsave (1-1)1," is still accepted, and duly saves to file ",".
We don't have any users of strtosz that profit from the check. In the
users we have, it appears to encourage sloppy error checking, or gets
in the way. Drop the bothersome check.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-11-22 12:46:06 +04:00
|
|
|
if (mul == 1 && mul_required) {
|
2010-10-21 19:15:46 +04:00
|
|
|
goto fail;
|
|
|
|
}
|
2011-01-05 13:41:02 +03:00
|
|
|
if ((val * mul >= INT64_MAX) || val < 0) {
|
2010-10-21 19:15:46 +04:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
retval = val * mul;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
if (end) {
|
|
|
|
*end = endptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
2010-12-09 16:17:24 +03:00
|
|
|
|
2011-07-07 18:13:11 +04:00
|
|
|
int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix)
|
|
|
|
{
|
2011-08-16 03:24:48 +04:00
|
|
|
return strtosz_suffix_unit(nptr, end, default_suffix, 1024);
|
2011-07-07 18:13:11 +04:00
|
|
|
}
|
|
|
|
|
2011-01-05 13:41:02 +03:00
|
|
|
int64_t strtosz(const char *nptr, char **end)
|
2010-12-09 16:17:24 +03:00
|
|
|
{
|
|
|
|
return strtosz_suffix(nptr, end, STRTOSZ_DEFSUFFIX_MB);
|
|
|
|
}
|
2011-09-28 14:41:32 +04:00
|
|
|
|
|
|
|
int qemu_parse_fd(const char *param)
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
char *endptr = NULL;
|
|
|
|
|
|
|
|
fd = strtol(param, &endptr, 10);
|
|
|
|
if (*endptr || (fd == 0 && param == endptr)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return fd;
|
|
|
|
}
|