* Q35 modeling improvements (Paolo, Vasily) * chardev cleanup improvements (Marc-André) * iscsi bugfix (Peter L.) * cpu_exec patch from multi-arch patches (Peter C.) * pci-assign tweak (Lin Ma) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJXc+GeAAoJEL/70l94x66DtIAH/3+eUBqSxVJ3SMUxJep2Op07 lIWqw1GHAdw1gWQDG4HzokKWrVVp/+NFYQjRFcNMfF8L+/Xm6hHAYc7Y4DMkDxSw zHX2BT93gPcaFJRz3Md8n2anzFHaWePx7LucPjaoas2OzrbVKXC8JT6n3GGnKQzZ 0CxDoyW4keI4ZVAOy9SOKsLPxdSvG8uLvaZU98l/YS/TuiGzpv8IWcdHR+k1hua+ FIenzj7jD9+JFoLEUWkU0pYs33J6yYKPiZn7HgGL9RNWKPFR88+CtMdYXgfOPo7z i05L9RTmL4SpahmStPN2r72MC0T0ub0czk/+qxBNms4r/2gBwaSyldmcTfAXM9o= =DA8v -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * serial port fixes (Paolo) * Q35 modeling improvements (Paolo, Vasily) * chardev cleanup improvements (Marc-André) * iscsi bugfix (Peter L.) * cpu_exec patch from multi-arch patches (Peter C.) * pci-assign tweak (Lin Ma) # gpg: Signature made Wed 29 Jun 2016 15:56:30 BST # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: (35 commits) socket: unlink unix socket on remove socket: add listen feature char: clean up remaining chardevs when leaving vhost-user: disable chardev handlers on close vhost-user-test: fix g_cond_wait_until compat implementation vl: smp_parse: fix regression ich9: implement SCI_IRQ_SEL register ich9: implement ACPI_EN register serial: reinstate watch after migration serial: remove watch on reset char: change qemu_chr_fe_add_watch to return unsigned serial: separate serial_xmit and serial_watch_cb serial: simplify tsr_retry reset serial: make tsr_retry unsigned iscsi: fix assertion in is_sector_request_lun_aligned target-*: Don't redefine cpu_exec() pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c vnc: generalize "VNC server running on ..." message scsi: esp: fix migration MC146818 RTC: add GPIO access to output IRQ ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
129 lines
4.2 KiB
C
129 lines
4.2 KiB
C
/* headers to use the BSD sockets */
|
|
#ifndef QEMU_SOCKET_H
|
|
#define QEMU_SOCKET_H
|
|
|
|
#ifdef _WIN32
|
|
|
|
int inet_aton(const char *cp, struct in_addr *ia);
|
|
|
|
#endif /* !_WIN32 */
|
|
|
|
#include "qapi-types.h"
|
|
|
|
/* misc helpers */
|
|
int qemu_socket(int domain, int type, int protocol);
|
|
int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
|
|
int socket_set_cork(int fd, int v);
|
|
int socket_set_nodelay(int fd);
|
|
void qemu_set_block(int fd);
|
|
void qemu_set_nonblock(int fd);
|
|
int socket_set_fast_reuse(int fd);
|
|
|
|
#ifdef WIN32
|
|
/* Windows has different names for the same constants with the same values */
|
|
#define SHUT_RD 0
|
|
#define SHUT_WR 1
|
|
#define SHUT_RDWR 2
|
|
#endif
|
|
|
|
/* callback function for nonblocking connect
|
|
* valid fd on success, negative error code on failure
|
|
*/
|
|
typedef void NonBlockingConnectHandler(int fd, Error *err, void *opaque);
|
|
|
|
InetSocketAddress *inet_parse(const char *str, Error **errp);
|
|
int inet_listen(const char *str, char *ostr, int olen,
|
|
int socktype, int port_offset, Error **errp);
|
|
int inet_connect(const char *str, Error **errp);
|
|
int inet_nonblocking_connect(const char *str,
|
|
NonBlockingConnectHandler *callback,
|
|
void *opaque, Error **errp);
|
|
|
|
NetworkAddressFamily inet_netfamily(int family);
|
|
|
|
int unix_listen(const char *path, char *ostr, int olen, Error **errp);
|
|
int unix_connect(const char *path, Error **errp);
|
|
int unix_nonblocking_connect(const char *str,
|
|
NonBlockingConnectHandler *callback,
|
|
void *opaque, Error **errp);
|
|
|
|
SocketAddress *socket_parse(const char *str, Error **errp);
|
|
int socket_connect(SocketAddress *addr, Error **errp,
|
|
NonBlockingConnectHandler *callback, void *opaque);
|
|
int socket_listen(SocketAddress *addr, Error **errp);
|
|
void socket_listen_cleanup(int fd, Error **errp);
|
|
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
|
|
|
|
/* Old, ipv4 only bits. Don't use for new code. */
|
|
int parse_host_port(struct sockaddr_in *saddr, const char *str);
|
|
int socket_init(void);
|
|
|
|
/**
|
|
* socket_sockaddr_to_address:
|
|
* @sa: socket address struct
|
|
* @salen: size of @sa struct
|
|
* @errp: pointer to uninitialized error object
|
|
*
|
|
* Get the string representation of the socket
|
|
* address. A pointer to the allocated address information
|
|
* struct will be returned, which the caller is required to
|
|
* release with a call qapi_free_SocketAddress when no
|
|
* longer required.
|
|
*
|
|
* Returns: the socket address struct, or NULL on error
|
|
*/
|
|
SocketAddress *
|
|
socket_sockaddr_to_address(struct sockaddr_storage *sa,
|
|
socklen_t salen,
|
|
Error **errp);
|
|
|
|
/**
|
|
* socket_local_address:
|
|
* @fd: the socket file handle
|
|
* @errp: pointer to uninitialized error object
|
|
*
|
|
* Get the string representation of the local socket
|
|
* address. A pointer to the allocated address information
|
|
* struct will be returned, which the caller is required to
|
|
* release with a call qapi_free_SocketAddress when no
|
|
* longer required.
|
|
*
|
|
* Returns: the socket address struct, or NULL on error
|
|
*/
|
|
SocketAddress *socket_local_address(int fd, Error **errp);
|
|
|
|
/**
|
|
* socket_remote_address:
|
|
* @fd: the socket file handle
|
|
* @errp: pointer to uninitialized error object
|
|
*
|
|
* Get the string representation of the remote socket
|
|
* address. A pointer to the allocated address information
|
|
* struct will be returned, which the caller is required to
|
|
* release with a call qapi_free_SocketAddress when no
|
|
* longer required.
|
|
*
|
|
* Returns: the socket address struct, or NULL on error
|
|
*/
|
|
SocketAddress *socket_remote_address(int fd, Error **errp);
|
|
|
|
|
|
void qapi_copy_SocketAddress(SocketAddress **p_dest,
|
|
SocketAddress *src);
|
|
|
|
/**
|
|
* socket_address_to_string:
|
|
* @addr: the socket address struct
|
|
* @errp: pointer to uninitialized error object
|
|
*
|
|
* Get the string representation of the socket
|
|
* address. A pointer to the char array containing
|
|
* string format will be returned, the caller is
|
|
* required to release the returned value when no
|
|
* longer required with g_free.
|
|
*
|
|
* Returns: the socket address in string format, or NULL on error
|
|
*/
|
|
char *socket_address_to_string(struct SocketAddress *addr, Error **errp);
|
|
#endif /* QEMU_SOCKET_H */
|