mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 19:49:43 +00:00
Merge I/O fixes 2016/02/16 v1
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJWw0NlAAoJEL6G67QVEE/f1/UP/iw5KIjKJGUv+eF3GP5dx779 6ZFuOfZ2QNGCon6uaRbfvZ/fsnyyHg/7WiXKO2QT/6dF+A602dbY5/HLfTq+5khr StNNlS5s12S81uWp4OspucHU6Vx0q7FFLfTLckPYg6Ban8nGW0CZH/KnllaKJZAu THJlaW6GecnYME4K8bWtBL2kiHv7AXjmztbtUedAtGH82DCMYkkzRE9EJgk0Fh/J Kdf0LSGtbuY0v1VgusFB5bi1nBQd2wTYhGCZztRqB8HO+FTpj16hv/xm2IDq03N/ iV1OyB1dV6Yuc/ZeHINrKCtnkCZj2OhY6UC8u0R5Hnfc6P9sNr3e3dov92bN7L6r OQoE03kqaHg0c2Q0gp8jbGcSKHq0BcaCg+6MgODkUH4XZXMi8YdZoUHu/95rGblL 9u4j2Fnplthz/PCfsbIddb5rnetUnF0X8QHIdMvvhneghwyCQTZ9emFC3LN/HWyY vbFURfxDWcmYQ8idAZi3kLsCCD/5M1wjj+KTMkORoKAVrJVWkM4zcAMoKfipONEg XHBsMlQJjhROcMltRf+IUHIV06IU+zxNAU8nJS+ZnYAxkWpr/Ep4Ah5LdLSIN6mQ /8hsCmkWGhGFlCSkZU45aXg5D4XzjrGYhvKzx8M3nM4mXLfcaxRxeLgpLivQe0Po X/IoYKebusTQOwrJX1IJ =+3s5 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into staging Merge I/O fixes 2016/02/16 v1 # gpg: Signature made Tue 16 Feb 2016 15:42:29 GMT using RSA key ID 15104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" * remotes/berrange/tags/pull-io-next-2016-02-16-1: io: convert QIOChannelBuffer to use uint8_t instead of char io: introduce helper for creating channels from file descriptors io: improve docs for QIOChannelSocket async functions Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
250f53ddaa
@ -42,7 +42,7 @@ struct QIOChannelBuffer {
|
||||
size_t capacity; /* Total allocated memory */
|
||||
size_t usage; /* Current size of data */
|
||||
size_t offset; /* Offset for future I/O ops */
|
||||
char *data;
|
||||
uint8_t *data;
|
||||
};
|
||||
|
||||
|
||||
|
@ -105,7 +105,9 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,
|
||||
* Attempt to connect to the address @addr. This method
|
||||
* will run in the background so the caller will regain
|
||||
* execution control immediately. The function @callback
|
||||
* will be invoked on completion or failure.
|
||||
* will be invoked on completion or failure. The @addr
|
||||
* parameter will be copied, so may be freed as soon
|
||||
* as this function returns without waiting for completion.
|
||||
*/
|
||||
void qio_channel_socket_connect_async(QIOChannelSocket *ioc,
|
||||
SocketAddress *addr,
|
||||
@ -140,7 +142,9 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *ioc,
|
||||
* Attempt to listen to the address @addr. This method
|
||||
* will run in the background so the caller will regain
|
||||
* execution control immediately. The function @callback
|
||||
* will be invoked on completion or failure.
|
||||
* will be invoked on completion or failure. The @addr
|
||||
* parameter will be copied, so may be freed as soon
|
||||
* as this function returns without waiting for completion.
|
||||
*/
|
||||
void qio_channel_socket_listen_async(QIOChannelSocket *ioc,
|
||||
SocketAddress *addr,
|
||||
@ -181,6 +185,9 @@ int qio_channel_socket_dgram_sync(QIOChannelSocket *ioc,
|
||||
* This method will run in the background so the caller
|
||||
* will regain execution control immediately. The function
|
||||
* @callback will be invoked on completion or failure.
|
||||
* The @localAddr and @remoteAddr parameters will be copied,
|
||||
* so may be freed as soon as this function returns without
|
||||
* waiting for completion.
|
||||
*/
|
||||
void qio_channel_socket_dgram_async(QIOChannelSocket *ioc,
|
||||
SocketAddress *localAddr,
|
||||
|
52
include/io/channel-util.h
Normal file
52
include/io/channel-util.h
Normal file
@ -0,0 +1,52 @@
|
||||
/*
|
||||
* QEMU I/O channels utility APIs
|
||||
*
|
||||
* Copyright (c) 2016 Red Hat, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef QIO_CHANNEL_UTIL_H__
|
||||
#define QIO_CHANNEL_UTIL_H__
|
||||
|
||||
#include "io/channel.h"
|
||||
|
||||
/*
|
||||
* This module provides helper functions that are useful when dealing
|
||||
* with QIOChannel objects
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* qio_channel_new_fd:
|
||||
* @fd: the file descriptor
|
||||
* @errp: pointer to a NULL-initialized error object
|
||||
*
|
||||
* Create a channel for performing I/O on the file
|
||||
* descriptor @fd. The particular subclass of QIOChannel
|
||||
* that is returned will depend on what underlying object
|
||||
* the file descriptor is associated with. It may be either
|
||||
* a QIOChannelSocket or a QIOChannelFile instance. Upon
|
||||
* success, the returned QIOChannel instance will own
|
||||
* the @fd file descriptor, and take responsibility for
|
||||
* closing it when no longer required. On failure, the
|
||||
* caller is responsible for closing @fd.
|
||||
*
|
||||
* Returns: the channel object, or NULL on error
|
||||
*/
|
||||
QIOChannel *qio_channel_new_fd(int fd,
|
||||
Error **errp);
|
||||
|
||||
#endif /* QIO_CHANNEL_UTIL_H__ */
|
@ -6,4 +6,5 @@ io-obj-y += channel-socket.o
|
||||
io-obj-y += channel-tls.o
|
||||
io-obj-y += channel-watch.o
|
||||
io-obj-y += channel-websock.o
|
||||
io-obj-y += channel-util.o
|
||||
io-obj-y += task.o
|
||||
|
@ -32,7 +32,7 @@ qio_channel_buffer_new(size_t capacity)
|
||||
ioc = QIO_CHANNEL_BUFFER(object_new(TYPE_QIO_CHANNEL_BUFFER));
|
||||
|
||||
if (capacity) {
|
||||
ioc->data = g_new0(char, capacity);
|
||||
ioc->data = g_new0(uint8_t, capacity);
|
||||
ioc->capacity = capacity;
|
||||
}
|
||||
|
||||
|
50
io/channel-util.c
Normal file
50
io/channel-util.c
Normal file
@ -0,0 +1,50 @@
|
||||
/*
|
||||
* QEMU I/O channels utility APIs
|
||||
*
|
||||
* Copyright (c) 2016 Red Hat, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "io/channel-util.h"
|
||||
#include "io/channel-file.h"
|
||||
#include "io/channel-socket.h"
|
||||
|
||||
|
||||
static bool fd_is_socket(int fd)
|
||||
{
|
||||
int optval;
|
||||
socklen_t optlen;
|
||||
optlen = sizeof(optval);
|
||||
return qemu_getsockopt(fd,
|
||||
SOL_SOCKET,
|
||||
SO_TYPE,
|
||||
(char *)&optval,
|
||||
&optlen) == 0;
|
||||
}
|
||||
|
||||
|
||||
QIOChannel *qio_channel_new_fd(int fd,
|
||||
Error **errp)
|
||||
{
|
||||
QIOChannel *ioc;
|
||||
|
||||
if (fd_is_socket(fd)) {
|
||||
ioc = QIO_CHANNEL(qio_channel_socket_new_fd(fd, errp));
|
||||
} else {
|
||||
ioc = QIO_CHANNEL(qio_channel_file_new_fd(fd));
|
||||
}
|
||||
return ioc;
|
||||
}
|
@ -20,6 +20,7 @@
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "io/channel-file.h"
|
||||
#include "io/channel-util.h"
|
||||
#include "io-channel-helpers.h"
|
||||
|
||||
|
||||
@ -50,6 +51,26 @@ static void test_io_channel_file(void)
|
||||
}
|
||||
|
||||
|
||||
static void test_io_channel_fd(void)
|
||||
{
|
||||
QIOChannel *ioc;
|
||||
int fd = -1;
|
||||
|
||||
#define TEST_FILE "tests/test-io-channel-file.txt"
|
||||
fd = open(TEST_FILE, O_CREAT | O_TRUNC | O_WRONLY, 0600);
|
||||
g_assert_cmpint(fd, >, -1);
|
||||
|
||||
ioc = qio_channel_new_fd(fd, &error_abort);
|
||||
|
||||
g_assert_cmpstr(object_get_typename(OBJECT(ioc)),
|
||||
==,
|
||||
TYPE_QIO_CHANNEL_FILE);
|
||||
|
||||
unlink(TEST_FILE);
|
||||
object_unref(OBJECT(ioc));
|
||||
}
|
||||
|
||||
|
||||
#ifndef _WIN32
|
||||
static void test_io_channel_pipe(bool async)
|
||||
{
|
||||
@ -93,6 +114,7 @@ int main(int argc, char **argv)
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
g_test_add_func("/io/channel/file", test_io_channel_file);
|
||||
g_test_add_func("/io/channel/file/fd", test_io_channel_fd);
|
||||
#ifndef _WIN32
|
||||
g_test_add_func("/io/channel/pipe/sync", test_io_channel_pipe_sync);
|
||||
g_test_add_func("/io/channel/pipe/async", test_io_channel_pipe_async);
|
||||
|
@ -20,6 +20,7 @@
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "io/channel-socket.h"
|
||||
#include "io/channel-util.h"
|
||||
#include "io-channel-helpers.h"
|
||||
#ifdef HAVE_IFADDRS_H
|
||||
#include <ifaddrs.h>
|
||||
@ -474,6 +475,24 @@ static void test_io_channel_unix_fd_pass(void)
|
||||
#endif /* _WIN32 */
|
||||
|
||||
|
||||
static void test_io_channel_ipv4_fd(void)
|
||||
{
|
||||
QIOChannel *ioc;
|
||||
int fd = -1;
|
||||
|
||||
fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||
g_assert_cmpint(fd, >, -1);
|
||||
|
||||
ioc = qio_channel_new_fd(fd, &error_abort);
|
||||
|
||||
g_assert_cmpstr(object_get_typename(OBJECT(ioc)),
|
||||
==,
|
||||
TYPE_QIO_CHANNEL_SOCKET);
|
||||
|
||||
object_unref(OBJECT(ioc));
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
bool has_ipv4, has_ipv6;
|
||||
@ -496,6 +515,8 @@ int main(int argc, char **argv)
|
||||
test_io_channel_ipv4_sync);
|
||||
g_test_add_func("/io/channel/socket/ipv4-async",
|
||||
test_io_channel_ipv4_async);
|
||||
g_test_add_func("/io/channel/socket/ipv4-fd",
|
||||
test_io_channel_ipv4_fd);
|
||||
}
|
||||
if (has_ipv6) {
|
||||
g_test_add_func("/io/channel/socket/ipv6-sync",
|
||||
|
Loading…
Reference in New Issue
Block a user