2007-01-07 22:04:40 +00:00
|
|
|
/*
|
|
|
|
* Simple C functions to supplement the C library
|
2007-09-16 21:08:06 +00:00
|
|
|
*
|
2007-01-07 22:04:40 +00: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 02:51:17 +00:00
|
|
|
#include "qemu-common.h"
|
2008-12-04 20:08:06 +00:00
|
|
|
#include "host-utils.h"
|
2010-10-21 15:15:46 +00:00
|
|
|
#include <math.h>
|
2007-01-07 22:04:40 +00:00
|
|
|
|
2011-09-08 11:46:25 +00:00
|
|
|
#include "qemu_socket.h"
|
consolidate qemu_iovec_memset{,_skip}() into single function and use existing iov_memset()
This patch combines two functions into one, and replaces
the implementation with already existing iov_memset() from
iov.c.
The new prototype of qemu_iovec_memset():
size_t qemu_iovec_memset(qiov, size_t offset, int fillc, size_t bytes)
It is different from former qemu_iovec_memset_skip(), and
I want to make other functions to be consistent with it
too: first how much to skip, second what, and 3rd how many
of it. It also returns actual number of bytes filled in,
which may be less than the requested `bytes' if qiov is
smaller than offset+bytes, in the same way iov_memset()
does.
While at it, use utility function iov_memset() from
iov.h in posix-aio-compat.c, where qiov was used.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-10 12:54:23 +00:00
|
|
|
#include "iov.h"
|
2011-09-08 11:46:25 +00:00
|
|
|
|
2012-07-09 06:50:43 +00:00
|
|
|
void strpadcpy(char *buf, int buf_size, const char *str, char pad)
|
|
|
|
{
|
|
|
|
int len = qemu_strnlen(str, buf_size);
|
|
|
|
memcpy(buf, str, len);
|
|
|
|
memset(buf + len, pad, buf_size - len);
|
|
|
|
}
|
|
|
|
|
2007-01-07 22:04:40 +00: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-16 21:08:06 +00:00
|
|
|
if (len < buf_size)
|
2007-01-07 22:04:40 +00: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 13:53:32 +00:00
|
|
|
if (qemu_toupper(*p) != qemu_toupper(*q))
|
2007-01-07 22:04:40 +00:00
|
|
|
return 0;
|
|
|
|
p++;
|
|
|
|
q++;
|
|
|
|
}
|
|
|
|
if (ptr)
|
|
|
|
*ptr = p;
|
|
|
|
return 1;
|
|
|
|
}
|
2007-11-10 19:36:39 +00:00
|
|
|
|
2009-07-01 18:24:44 +00: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 19:36:39 +00: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 19:19:45 +00:00
|
|
|
|
2008-12-11 19:37:54 +00:00
|
|
|
int qemu_fls(int i)
|
2008-12-04 19:19:45 +00:00
|
|
|
{
|
2008-12-04 20:08:06 +00:00
|
|
|
return 32 - clz32(i);
|
2008-12-04 19:19:45 +00:00
|
|
|
}
|
2009-01-22 16:59:20 +00:00
|
|
|
|
2009-09-04 17:01:32 +00: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 06:56:26 +00:00
|
|
|
#ifdef CONFIG_FDATASYNC
|
2009-09-04 17:01:32 +00:00
|
|
|
return fdatasync(fd);
|
|
|
|
#else
|
|
|
|
return fsync(fd);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2009-01-22 16:59:20 +00:00
|
|
|
/* io vectors */
|
|
|
|
|
|
|
|
void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint)
|
|
|
|
{
|
2011-08-21 03:09:37 +00:00
|
|
|
qiov->iov = g_malloc(alloc_hint * sizeof(struct iovec));
|
2009-01-22 16:59:20 +00:00
|
|
|
qiov->niov = 0;
|
|
|
|
qiov->nalloc = alloc_hint;
|
2009-01-26 17:17:52 +00:00
|
|
|
qiov->size = 0;
|
2009-01-22 16:59:20 +00:00
|
|
|
}
|
|
|
|
|
2009-03-28 17:46:10 +00: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 16:59:20 +00:00
|
|
|
void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
|
|
|
|
{
|
2009-03-28 17:46:10 +00:00
|
|
|
assert(qiov->nalloc != -1);
|
|
|
|
|
2009-01-22 16:59:20 +00:00
|
|
|
if (qiov->niov == qiov->nalloc) {
|
|
|
|
qiov->nalloc = 2 * qiov->nalloc + 1;
|
2011-08-21 03:09:37 +00:00
|
|
|
qiov->iov = g_realloc(qiov->iov, qiov->nalloc * sizeof(struct iovec));
|
2009-01-22 16:59:20 +00:00
|
|
|
}
|
|
|
|
qiov->iov[qiov->niov].iov_base = base;
|
|
|
|
qiov->iov[qiov->niov].iov_len = len;
|
2009-01-26 17:17:52 +00:00
|
|
|
qiov->size += len;
|
2009-01-22 16:59:20 +00:00
|
|
|
++qiov->niov;
|
|
|
|
}
|
|
|
|
|
2009-09-09 15:53:37 +00:00
|
|
|
/*
|
consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent
qemu_iovec_concat() is currently a wrapper for
qemu_iovec_copy(), use the former (with extra
"0" arg) in a few places where it is used.
Change skip argument of qemu_iovec_copy() from
uint64_t to size_t, since size of qiov itself
is size_t, so there's no way to skip larger
sizes. Rename it to soffset, to make it clear
that the offset is applied to src.
Also change the only usage of uint64_t in
hw/9pfs/virtio-9p.c, in v9fs_init_qiov_from_pdu() -
all callers of it actually uses size_t too,
not uint64_t.
One added restriction: as for all other iovec-related
functions, soffset must point inside src.
Order of argumens is already good:
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes)
vs:
qemu_iovec_concat(QEMUIOVector *dst,
QEMUIOVector *src,
size_t soffset, size_t sbytes)
(note soffset is after _src_ not dst, since it applies to src;
for memset it applies to qiov).
Note that in many places where this function is used,
the previous call is qemu_iovec_reset(), which means
many callers actually want copy (replacing dst content),
not concat. So we may want to add a wrapper like
qemu_iovec_copy() with the same arguments but which
calls qemu_iovec_reset() before _concat().
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-12 17:28:06 +00:00
|
|
|
* Concatenates (partial) iovecs from src to the end of dst.
|
|
|
|
* It starts copying after skipping `soffset' bytes at the
|
|
|
|
* beginning of src and adds individual vectors from src to
|
|
|
|
* dst copies up to `sbytes' bytes total, or up to the end
|
|
|
|
* of src if it comes first. This way, it is okay to specify
|
|
|
|
* very large value for `sbytes' to indicate "up to the end
|
|
|
|
* of src".
|
|
|
|
* Only vector pointers are processed, not the actual data buffers.
|
2009-09-09 15:53:37 +00:00
|
|
|
*/
|
consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent
qemu_iovec_concat() is currently a wrapper for
qemu_iovec_copy(), use the former (with extra
"0" arg) in a few places where it is used.
Change skip argument of qemu_iovec_copy() from
uint64_t to size_t, since size of qiov itself
is size_t, so there's no way to skip larger
sizes. Rename it to soffset, to make it clear
that the offset is applied to src.
Also change the only usage of uint64_t in
hw/9pfs/virtio-9p.c, in v9fs_init_qiov_from_pdu() -
all callers of it actually uses size_t too,
not uint64_t.
One added restriction: as for all other iovec-related
functions, soffset must point inside src.
Order of argumens is already good:
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes)
vs:
qemu_iovec_concat(QEMUIOVector *dst,
QEMUIOVector *src,
size_t soffset, size_t sbytes)
(note soffset is after _src_ not dst, since it applies to src;
for memset it applies to qiov).
Note that in many places where this function is used,
the previous call is qemu_iovec_reset(), which means
many callers actually want copy (replacing dst content),
not concat. So we may want to add a wrapper like
qemu_iovec_copy() with the same arguments but which
calls qemu_iovec_reset() before _concat().
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-12 17:28:06 +00:00
|
|
|
void qemu_iovec_concat(QEMUIOVector *dst,
|
|
|
|
QEMUIOVector *src, size_t soffset, size_t sbytes)
|
2009-09-09 15:53:37 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
size_t done;
|
consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent
qemu_iovec_concat() is currently a wrapper for
qemu_iovec_copy(), use the former (with extra
"0" arg) in a few places where it is used.
Change skip argument of qemu_iovec_copy() from
uint64_t to size_t, since size of qiov itself
is size_t, so there's no way to skip larger
sizes. Rename it to soffset, to make it clear
that the offset is applied to src.
Also change the only usage of uint64_t in
hw/9pfs/virtio-9p.c, in v9fs_init_qiov_from_pdu() -
all callers of it actually uses size_t too,
not uint64_t.
One added restriction: as for all other iovec-related
functions, soffset must point inside src.
Order of argumens is already good:
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes)
vs:
qemu_iovec_concat(QEMUIOVector *dst,
QEMUIOVector *src,
size_t soffset, size_t sbytes)
(note soffset is after _src_ not dst, since it applies to src;
for memset it applies to qiov).
Note that in many places where this function is used,
the previous call is qemu_iovec_reset(), which means
many callers actually want copy (replacing dst content),
not concat. So we may want to add a wrapper like
qemu_iovec_copy() with the same arguments but which
calls qemu_iovec_reset() before _concat().
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-12 17:28:06 +00:00
|
|
|
struct iovec *siov = src->iov;
|
2009-09-09 15:53:37 +00:00
|
|
|
assert(dst->nalloc != -1);
|
consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent
qemu_iovec_concat() is currently a wrapper for
qemu_iovec_copy(), use the former (with extra
"0" arg) in a few places where it is used.
Change skip argument of qemu_iovec_copy() from
uint64_t to size_t, since size of qiov itself
is size_t, so there's no way to skip larger
sizes. Rename it to soffset, to make it clear
that the offset is applied to src.
Also change the only usage of uint64_t in
hw/9pfs/virtio-9p.c, in v9fs_init_qiov_from_pdu() -
all callers of it actually uses size_t too,
not uint64_t.
One added restriction: as for all other iovec-related
functions, soffset must point inside src.
Order of argumens is already good:
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes)
vs:
qemu_iovec_concat(QEMUIOVector *dst,
QEMUIOVector *src,
size_t soffset, size_t sbytes)
(note soffset is after _src_ not dst, since it applies to src;
for memset it applies to qiov).
Note that in many places where this function is used,
the previous call is qemu_iovec_reset(), which means
many callers actually want copy (replacing dst content),
not concat. So we may want to add a wrapper like
qemu_iovec_copy() with the same arguments but which
calls qemu_iovec_reset() before _concat().
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-12 17:28:06 +00:00
|
|
|
assert(src->size >= soffset);
|
|
|
|
for (i = 0, done = 0; done < sbytes && i < src->niov; i++) {
|
|
|
|
if (soffset < siov[i].iov_len) {
|
|
|
|
size_t len = MIN(siov[i].iov_len - soffset, sbytes - done);
|
|
|
|
qemu_iovec_add(dst, siov[i].iov_base + soffset, len);
|
|
|
|
done += len;
|
|
|
|
soffset = 0;
|
2010-09-13 16:06:11 +00:00
|
|
|
} else {
|
consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent
qemu_iovec_concat() is currently a wrapper for
qemu_iovec_copy(), use the former (with extra
"0" arg) in a few places where it is used.
Change skip argument of qemu_iovec_copy() from
uint64_t to size_t, since size of qiov itself
is size_t, so there's no way to skip larger
sizes. Rename it to soffset, to make it clear
that the offset is applied to src.
Also change the only usage of uint64_t in
hw/9pfs/virtio-9p.c, in v9fs_init_qiov_from_pdu() -
all callers of it actually uses size_t too,
not uint64_t.
One added restriction: as for all other iovec-related
functions, soffset must point inside src.
Order of argumens is already good:
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes)
vs:
qemu_iovec_concat(QEMUIOVector *dst,
QEMUIOVector *src,
size_t soffset, size_t sbytes)
(note soffset is after _src_ not dst, since it applies to src;
for memset it applies to qiov).
Note that in many places where this function is used,
the previous call is qemu_iovec_reset(), which means
many callers actually want copy (replacing dst content),
not concat. So we may want to add a wrapper like
qemu_iovec_copy() with the same arguments but which
calls qemu_iovec_reset() before _concat().
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-12 17:28:06 +00:00
|
|
|
soffset -= siov[i].iov_len;
|
2010-09-13 16:06:11 +00:00
|
|
|
}
|
2009-09-09 15:53:37 +00:00
|
|
|
}
|
consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent
qemu_iovec_concat() is currently a wrapper for
qemu_iovec_copy(), use the former (with extra
"0" arg) in a few places where it is used.
Change skip argument of qemu_iovec_copy() from
uint64_t to size_t, since size of qiov itself
is size_t, so there's no way to skip larger
sizes. Rename it to soffset, to make it clear
that the offset is applied to src.
Also change the only usage of uint64_t in
hw/9pfs/virtio-9p.c, in v9fs_init_qiov_from_pdu() -
all callers of it actually uses size_t too,
not uint64_t.
One added restriction: as for all other iovec-related
functions, soffset must point inside src.
Order of argumens is already good:
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes)
vs:
qemu_iovec_concat(QEMUIOVector *dst,
QEMUIOVector *src,
size_t soffset, size_t sbytes)
(note soffset is after _src_ not dst, since it applies to src;
for memset it applies to qiov).
Note that in many places where this function is used,
the previous call is qemu_iovec_reset(), which means
many callers actually want copy (replacing dst content),
not concat. So we may want to add a wrapper like
qemu_iovec_copy() with the same arguments but which
calls qemu_iovec_reset() before _concat().
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-12 17:28:06 +00:00
|
|
|
/* return done; */
|
2010-09-13 16:06:11 +00:00
|
|
|
}
|
|
|
|
|
2009-01-22 16:59:20 +00:00
|
|
|
void qemu_iovec_destroy(QEMUIOVector *qiov)
|
|
|
|
{
|
2009-03-28 17:46:10 +00:00
|
|
|
assert(qiov->nalloc != -1);
|
|
|
|
|
2011-11-25 11:06:22 +00:00
|
|
|
qemu_iovec_reset(qiov);
|
2011-08-21 03:09:37 +00:00
|
|
|
g_free(qiov->iov);
|
2011-11-25 11:06:22 +00:00
|
|
|
qiov->nalloc = 0;
|
|
|
|
qiov->iov = NULL;
|
2009-01-22 16:59:20 +00:00
|
|
|
}
|
|
|
|
|
2009-02-05 21:23:54 +00:00
|
|
|
void qemu_iovec_reset(QEMUIOVector *qiov)
|
|
|
|
{
|
2009-03-28 17:46:10 +00:00
|
|
|
assert(qiov->nalloc != -1);
|
|
|
|
|
2009-02-05 21:23:54 +00:00
|
|
|
qiov->niov = 0;
|
|
|
|
qiov->size = 0;
|
|
|
|
}
|
|
|
|
|
2012-06-07 16:21:06 +00:00
|
|
|
size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset,
|
|
|
|
void *buf, size_t bytes)
|
2009-01-22 16:59:20 +00:00
|
|
|
{
|
2012-06-07 16:21:06 +00:00
|
|
|
return iov_to_buf(qiov->iov, qiov->niov, offset, buf, bytes);
|
2009-01-22 16:59:20 +00:00
|
|
|
}
|
|
|
|
|
allow qemu_iovec_from_buffer() to specify offset from which to start copying
Similar to
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes);
the new prototype is:
qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
const void *buf, size_t bytes);
The processing starts at offset bytes within qiov.
This way, we may copy a bounce buffer directly to
a middle of qiov.
This is exactly the same function as iov_from_buf() from
iov.c, so use the existing implementation and rename it
to qemu_iovec_from_buf() to be shorter and to match the
utility function.
As with utility implementation, we now assert that the
offset is inside actual iovec. Nothing changed for
current callers, because `offset' parameter is new.
While at it, stop using "bounce-qiov" in block/qcow2.c
and copy decrypted data directly from cluster_data
instead of recreating a temp qiov for doing that.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-06-07 16:17:55 +00:00
|
|
|
size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
|
|
|
|
const void *buf, size_t bytes)
|
2009-01-22 16:59:20 +00:00
|
|
|
{
|
allow qemu_iovec_from_buffer() to specify offset from which to start copying
Similar to
qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
int c, size_t bytes);
the new prototype is:
qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
const void *buf, size_t bytes);
The processing starts at offset bytes within qiov.
This way, we may copy a bounce buffer directly to
a middle of qiov.
This is exactly the same function as iov_from_buf() from
iov.c, so use the existing implementation and rename it
to qemu_iovec_from_buf() to be shorter and to match the
utility function.
As with utility implementation, we now assert that the
offset is inside actual iovec. Nothing changed for
current callers, because `offset' parameter is new.
While at it, stop using "bounce-qiov" in block/qcow2.c
and copy decrypted data directly from cluster_data
instead of recreating a temp qiov for doing that.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-06-07 16:17:55 +00:00
|
|
|
return iov_from_buf(qiov->iov, qiov->niov, offset, buf, bytes);
|
2009-01-22 16:59:20 +00:00
|
|
|
}
|
2010-03-10 10:38:55 +00:00
|
|
|
|
consolidate qemu_iovec_memset{,_skip}() into single function and use existing iov_memset()
This patch combines two functions into one, and replaces
the implementation with already existing iov_memset() from
iov.c.
The new prototype of qemu_iovec_memset():
size_t qemu_iovec_memset(qiov, size_t offset, int fillc, size_t bytes)
It is different from former qemu_iovec_memset_skip(), and
I want to make other functions to be consistent with it
too: first how much to skip, second what, and 3rd how many
of it. It also returns actual number of bytes filled in,
which may be less than the requested `bytes' if qiov is
smaller than offset+bytes, in the same way iov_memset()
does.
While at it, use utility function iov_memset() from
iov.h in posix-aio-compat.c, where qiov was used.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-10 12:54:23 +00:00
|
|
|
size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
|
|
|
|
int fillc, size_t bytes)
|
2010-09-13 16:06:11 +00:00
|
|
|
{
|
consolidate qemu_iovec_memset{,_skip}() into single function and use existing iov_memset()
This patch combines two functions into one, and replaces
the implementation with already existing iov_memset() from
iov.c.
The new prototype of qemu_iovec_memset():
size_t qemu_iovec_memset(qiov, size_t offset, int fillc, size_t bytes)
It is different from former qemu_iovec_memset_skip(), and
I want to make other functions to be consistent with it
too: first how much to skip, second what, and 3rd how many
of it. It also returns actual number of bytes filled in,
which may be less than the requested `bytes' if qiov is
smaller than offset+bytes, in the same way iov_memset()
does.
While at it, use utility function iov_memset() from
iov.h in posix-aio-compat.c, where qiov was used.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-03-10 12:54:23 +00:00
|
|
|
return iov_memset(qiov->iov, qiov->niov, offset, fillc, bytes);
|
2011-02-03 15:12:49 +00:00
|
|
|
}
|
|
|
|
|
2012-02-07 13:27:24 +00:00
|
|
|
/*
|
|
|
|
* Checks if a buffer is all zeroes
|
|
|
|
*
|
|
|
|
* Attention! The len must be a multiple of 4 * sizeof(long) due to
|
|
|
|
* restriction of optimizations in this function.
|
|
|
|
*/
|
|
|
|
bool buffer_is_zero(const void *buf, size_t len)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Use long as the biggest available internal data type that fits into the
|
|
|
|
* CPU register and unroll the loop to smooth out the effect of memory
|
|
|
|
* latency.
|
|
|
|
*/
|
|
|
|
|
|
|
|
size_t i;
|
|
|
|
long d0, d1, d2, d3;
|
|
|
|
const long * const data = buf;
|
|
|
|
|
|
|
|
assert(len % (4 * sizeof(long)) == 0);
|
|
|
|
len /= sizeof(long);
|
|
|
|
|
|
|
|
for (i = 0; i < len; i += 4) {
|
|
|
|
d0 = data[i + 0];
|
|
|
|
d1 = data[i + 1];
|
|
|
|
d2 = data[i + 2];
|
|
|
|
d3 = data[i + 3];
|
|
|
|
|
|
|
|
if (d0 || d1 || d2 || d3) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2010-03-10 10:38:55 +00: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 08:46:06 +00: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 15:15:46 +00:00
|
|
|
/*
|
|
|
|
* Convert string to bytes, allowing either B/b for bytes, K/k for KB,
|
2011-11-22 08:46:01 +00: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 08:46:06 +00:00
|
|
|
* in *end, if not NULL. Return -1 on error.
|
2010-10-21 15:15:46 +00:00
|
|
|
*/
|
2011-07-07 14:13:11 +00:00
|
|
|
int64_t strtosz_suffix_unit(const char *nptr, char **end,
|
|
|
|
const char default_suffix, int64_t unit)
|
2010-10-21 15:15:46 +00:00
|
|
|
{
|
2011-01-05 10:41:02 +00:00
|
|
|
int64_t retval = -1;
|
2011-01-24 15:33:28 +00: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 08:46:06 +00:00
|
|
|
unsigned char c;
|
2010-10-21 15:15:46 +00: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 15:33:30 +00:00
|
|
|
fraction = modf(val, &integral);
|
|
|
|
if (fraction != 0) {
|
2010-10-21 15:15:46 +00: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 08:46:06 +00:00
|
|
|
mul = suffix_mul(c, unit);
|
|
|
|
if (mul >= 0) {
|
|
|
|
endptr++;
|
|
|
|
} else {
|
|
|
|
mul = suffix_mul(default_suffix, unit);
|
|
|
|
assert(mul >= 0);
|
2010-10-21 15:15:46 +00: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 08:46:06 +00:00
|
|
|
if (mul == 1 && mul_required) {
|
2010-10-21 15:15:46 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2011-01-05 10:41:02 +00:00
|
|
|
if ((val * mul >= INT64_MAX) || val < 0) {
|
2010-10-21 15:15:46 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
retval = val * mul;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
if (end) {
|
|
|
|
*end = endptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
2010-12-09 13:17:24 +00:00
|
|
|
|
2011-07-07 14:13:11 +00:00
|
|
|
int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix)
|
|
|
|
{
|
2011-08-15 23:24:48 +00:00
|
|
|
return strtosz_suffix_unit(nptr, end, default_suffix, 1024);
|
2011-07-07 14:13:11 +00:00
|
|
|
}
|
|
|
|
|
2011-01-05 10:41:02 +00:00
|
|
|
int64_t strtosz(const char *nptr, char **end)
|
2010-12-09 13:17:24 +00:00
|
|
|
{
|
|
|
|
return strtosz_suffix(nptr, end, STRTOSZ_DEFSUFFIX_MB);
|
|
|
|
}
|
2011-09-28 10:41:32 +00: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;
|
|
|
|
}
|