diff options
| author | Peter Maydell | 2016-06-28 11:32:13 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-28 11:32:13 +0200 |
| commit | 40428feaeb9708f1bc5b2582d9f071a3db907c07 (patch) | |
| tree | 06ae2966b14cee2339af160475d5ff075c892c03 /include | |
| parent | misc/aspeed_scu: Fix build error caused by missing header (diff) | |
| parent | vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU (diff) | |
| download | qemu-40428feaeb9708f1bc5b2582d9f071a3db907c07.tar.gz qemu-40428feaeb9708f1bc5b2582d9f071a3db907c07.tar.xz qemu-40428feaeb9708f1bc5b2582d9f071a3db907c07.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 28 Jun 2016 04:29:53 BST
# gpg: using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU
rtl8139: save/load RxMulOk counter (again)
Change net/socket.c to use socket_*() functions
net: mipsnet: check transmit buffer size before sending
net: fix qemu_announce_self not emitting packets
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/sockets.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 1bd92180f3..3a1a8873af 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -110,4 +110,18 @@ SocketAddress *socket_remote_address(int fd, Error **errp); void qapi_copy_SocketAddress(SocketAddress **p_dest, SocketAddress *src); -#endif /* QEMU_SOCKET_H */ +/** + * 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 */
\ No newline at end of file |