da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
94 lines
2.8 KiB
C
94 lines
2.8 KiB
C
/*
|
|
* Copyright (C) 2005 Anthony Liguori <anthony@codemonkey.ws>
|
|
*
|
|
* Network Block Device Common Code
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; under version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "nbd-internal.h"
|
|
|
|
ssize_t nbd_wr_syncv(QIOChannel *ioc,
|
|
struct iovec *iov,
|
|
size_t niov,
|
|
size_t offset,
|
|
size_t length,
|
|
bool do_read)
|
|
{
|
|
ssize_t done = 0;
|
|
Error *local_err = NULL;
|
|
struct iovec *local_iov = g_new(struct iovec, niov);
|
|
struct iovec *local_iov_head = local_iov;
|
|
unsigned int nlocal_iov = niov;
|
|
|
|
nlocal_iov = iov_copy(local_iov, nlocal_iov,
|
|
iov, niov,
|
|
offset, length);
|
|
|
|
while (nlocal_iov > 0) {
|
|
ssize_t len;
|
|
if (do_read) {
|
|
len = qio_channel_readv(ioc, local_iov, nlocal_iov, &local_err);
|
|
} else {
|
|
len = qio_channel_writev(ioc, local_iov, nlocal_iov, &local_err);
|
|
}
|
|
if (len == QIO_CHANNEL_ERR_BLOCK) {
|
|
if (qemu_in_coroutine()) {
|
|
/* XXX figure out if we can create a variant on
|
|
* qio_channel_yield() that works with AIO contexts
|
|
* and consider using that in this branch */
|
|
qemu_coroutine_yield();
|
|
} else {
|
|
qio_channel_wait(ioc,
|
|
do_read ? G_IO_IN : G_IO_OUT);
|
|
}
|
|
continue;
|
|
}
|
|
if (len < 0) {
|
|
TRACE("I/O error: %s", error_get_pretty(local_err));
|
|
error_free(local_err);
|
|
/* XXX handle Error objects */
|
|
done = -EIO;
|
|
goto cleanup;
|
|
}
|
|
|
|
if (do_read && len == 0) {
|
|
break;
|
|
}
|
|
|
|
iov_discard_front(&local_iov, &nlocal_iov, len);
|
|
done += len;
|
|
}
|
|
|
|
cleanup:
|
|
g_free(local_iov_head);
|
|
return done;
|
|
}
|
|
|
|
|
|
void nbd_tls_handshake(Object *src,
|
|
Error *err,
|
|
void *opaque)
|
|
{
|
|
struct NBDTLSHandshakeData *data = opaque;
|
|
|
|
if (err) {
|
|
TRACE("TLS failed %s", error_get_pretty(err));
|
|
data->error = error_copy(err);
|
|
}
|
|
data->complete = true;
|
|
g_main_loop_quit(data->loop);
|
|
}
|