janitor: move iovector functions out of cutils.c
This removes the dependency of cutils.c on iov.c, and lets us remove iov.o from several builds. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
8473f37739
commit
0191253cea
2
Makefile
2
Makefile
|
@ -161,7 +161,7 @@ qemu-img.o: qemu-img-cmds.h
|
||||||
|
|
||||||
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
|
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
|
||||||
qemu-timer-common.o main-loop.o notify.o \
|
qemu-timer-common.o main-loop.o notify.o \
|
||||||
iohandler.o cutils.o iov.o async.o error.o
|
iohandler.o cutils.o async.o error.o
|
||||||
tools-obj-$(CONFIG_POSIX) += compatfd.o
|
tools-obj-$(CONFIG_POSIX) += compatfd.o
|
||||||
|
|
||||||
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
|
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
|
||||||
|
|
|
@ -92,7 +92,7 @@ common-obj-y += ui/
|
||||||
common-obj-y += bt-host.o bt-vhci.o
|
common-obj-y += bt-host.o bt-vhci.o
|
||||||
|
|
||||||
common-obj-y += dma-helpers.o
|
common-obj-y += dma-helpers.o
|
||||||
common-obj-y += iov.o acl.o
|
common-obj-y += acl.o
|
||||||
common-obj-$(CONFIG_POSIX) += compatfd.o
|
common-obj-$(CONFIG_POSIX) += compatfd.o
|
||||||
common-obj-y += event_notifier.o
|
common-obj-y += event_notifier.o
|
||||||
common-obj-y += qemu-timer.o qemu-timer-common.o
|
common-obj-y += qemu-timer.o qemu-timer-common.o
|
||||||
|
@ -113,7 +113,7 @@ endif
|
||||||
user-obj-y =
|
user-obj-y =
|
||||||
user-obj-y += envlist.o path.o
|
user-obj-y += envlist.o path.o
|
||||||
user-obj-y += tcg-runtime.o host-utils.o
|
user-obj-y += tcg-runtime.o host-utils.o
|
||||||
user-obj-y += cutils.o iov.o cache-utils.o
|
user-obj-y += cutils.o cache-utils.o
|
||||||
user-obj-y += module.o
|
user-obj-y += module.o
|
||||||
user-obj-y += qemu-user.o
|
user-obj-y += qemu-user.o
|
||||||
user-obj-y += $(trace-obj-y)
|
user-obj-y += $(trace-obj-y)
|
||||||
|
|
103
cutils.c
103
cutils.c
|
@ -142,109 +142,6 @@ int qemu_fdatasync(int fd)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* io vectors */
|
|
||||||
|
|
||||||
void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint)
|
|
||||||
{
|
|
||||||
qiov->iov = g_malloc(alloc_hint * sizeof(struct iovec));
|
|
||||||
qiov->niov = 0;
|
|
||||||
qiov->nalloc = alloc_hint;
|
|
||||||
qiov->size = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
|
|
||||||
{
|
|
||||||
assert(qiov->nalloc != -1);
|
|
||||||
|
|
||||||
if (qiov->niov == qiov->nalloc) {
|
|
||||||
qiov->nalloc = 2 * qiov->nalloc + 1;
|
|
||||||
qiov->iov = g_realloc(qiov->iov, qiov->nalloc * sizeof(struct iovec));
|
|
||||||
}
|
|
||||||
qiov->iov[qiov->niov].iov_base = base;
|
|
||||||
qiov->iov[qiov->niov].iov_len = len;
|
|
||||||
qiov->size += len;
|
|
||||||
++qiov->niov;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
void qemu_iovec_concat(QEMUIOVector *dst,
|
|
||||||
QEMUIOVector *src, size_t soffset, size_t sbytes)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
size_t done;
|
|
||||||
struct iovec *siov = src->iov;
|
|
||||||
assert(dst->nalloc != -1);
|
|
||||||
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;
|
|
||||||
} else {
|
|
||||||
soffset -= siov[i].iov_len;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* return done; */
|
|
||||||
}
|
|
||||||
|
|
||||||
void qemu_iovec_destroy(QEMUIOVector *qiov)
|
|
||||||
{
|
|
||||||
assert(qiov->nalloc != -1);
|
|
||||||
|
|
||||||
qemu_iovec_reset(qiov);
|
|
||||||
g_free(qiov->iov);
|
|
||||||
qiov->nalloc = 0;
|
|
||||||
qiov->iov = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void qemu_iovec_reset(QEMUIOVector *qiov)
|
|
||||||
{
|
|
||||||
assert(qiov->nalloc != -1);
|
|
||||||
|
|
||||||
qiov->niov = 0;
|
|
||||||
qiov->size = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset,
|
|
||||||
void *buf, size_t bytes)
|
|
||||||
{
|
|
||||||
return iov_to_buf(qiov->iov, qiov->niov, offset, buf, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
|
|
||||||
const void *buf, size_t bytes)
|
|
||||||
{
|
|
||||||
return iov_from_buf(qiov->iov, qiov->niov, offset, buf, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
|
|
||||||
int fillc, size_t bytes)
|
|
||||||
{
|
|
||||||
return iov_memset(qiov->iov, qiov->niov, offset, fillc, bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Checks if a buffer is all zeroes
|
* Checks if a buffer is all zeroes
|
||||||
*
|
*
|
||||||
|
|
103
iov.c
103
iov.c
|
@ -228,3 +228,106 @@ void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt,
|
||||||
fprintf(fp, "\n");
|
fprintf(fp, "\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* io vectors */
|
||||||
|
|
||||||
|
void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint)
|
||||||
|
{
|
||||||
|
qiov->iov = g_malloc(alloc_hint * sizeof(struct iovec));
|
||||||
|
qiov->niov = 0;
|
||||||
|
qiov->nalloc = alloc_hint;
|
||||||
|
qiov->size = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
|
||||||
|
{
|
||||||
|
assert(qiov->nalloc != -1);
|
||||||
|
|
||||||
|
if (qiov->niov == qiov->nalloc) {
|
||||||
|
qiov->nalloc = 2 * qiov->nalloc + 1;
|
||||||
|
qiov->iov = g_realloc(qiov->iov, qiov->nalloc * sizeof(struct iovec));
|
||||||
|
}
|
||||||
|
qiov->iov[qiov->niov].iov_base = base;
|
||||||
|
qiov->iov[qiov->niov].iov_len = len;
|
||||||
|
qiov->size += len;
|
||||||
|
++qiov->niov;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
void qemu_iovec_concat(QEMUIOVector *dst,
|
||||||
|
QEMUIOVector *src, size_t soffset, size_t sbytes)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
size_t done;
|
||||||
|
struct iovec *siov = src->iov;
|
||||||
|
assert(dst->nalloc != -1);
|
||||||
|
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;
|
||||||
|
} else {
|
||||||
|
soffset -= siov[i].iov_len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* return done; */
|
||||||
|
}
|
||||||
|
|
||||||
|
void qemu_iovec_destroy(QEMUIOVector *qiov)
|
||||||
|
{
|
||||||
|
assert(qiov->nalloc != -1);
|
||||||
|
|
||||||
|
qemu_iovec_reset(qiov);
|
||||||
|
g_free(qiov->iov);
|
||||||
|
qiov->nalloc = 0;
|
||||||
|
qiov->iov = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void qemu_iovec_reset(QEMUIOVector *qiov)
|
||||||
|
{
|
||||||
|
assert(qiov->nalloc != -1);
|
||||||
|
|
||||||
|
qiov->niov = 0;
|
||||||
|
qiov->size = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset,
|
||||||
|
void *buf, size_t bytes)
|
||||||
|
{
|
||||||
|
return iov_to_buf(qiov->iov, qiov->niov, offset, buf, bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
|
||||||
|
const void *buf, size_t bytes)
|
||||||
|
{
|
||||||
|
return iov_from_buf(qiov->iov, qiov->niov, offset, buf, bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
|
||||||
|
int fillc, size_t bytes)
|
||||||
|
{
|
||||||
|
return iov_memset(qiov->iov, qiov->niov, offset, fillc, bytes);
|
||||||
|
}
|
||||||
|
|
|
@ -48,7 +48,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o qdict.o qfloat.o qint.o qstring.
|
||||||
tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o
|
tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o
|
||||||
tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o
|
tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o
|
||||||
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) $(tools-obj-y)
|
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) $(tools-obj-y)
|
||||||
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y)
|
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) iov.o
|
||||||
tests/test-iov$(EXESUF): tests/test-iov.o iov.o
|
tests/test-iov$(EXESUF): tests/test-iov.o iov.o
|
||||||
|
|
||||||
tests/test-qapi-types.c tests/test-qapi-types.h :\
|
tests/test-qapi-types.c tests/test-qapi-types.h :\
|
||||||
|
|
Loading…
Reference in New Issue