|
@@ -97,6 +97,56 @@ static int socket_shutdown(void *opaque, bool rd, bool wr)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+static int socket_return_close(void *opaque)
|
|
|
+{
|
|
|
+ QEMUFileSocket *s = opaque;
|
|
|
+ /*
|
|
|
+ * Note: We don't close the socket, that should be done by the forward
|
|
|
+ * path.
|
|
|
+ */
|
|
|
+ g_free(s);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static const QEMUFileOps socket_return_read_ops = {
|
|
|
+ .get_fd = socket_get_fd,
|
|
|
+ .get_buffer = socket_get_buffer,
|
|
|
+ .close = socket_return_close,
|
|
|
+ .shut_down = socket_shutdown,
|
|
|
+};
|
|
|
+
|
|
|
+static const QEMUFileOps socket_return_write_ops = {
|
|
|
+ .get_fd = socket_get_fd,
|
|
|
+ .writev_buffer = socket_writev_buffer,
|
|
|
+ .close = socket_return_close,
|
|
|
+ .shut_down = socket_shutdown,
|
|
|
+};
|
|
|
+
|
|
|
+/*
|
|
|
+ * Give a QEMUFile* off the same socket but data in the opposite
|
|
|
+ * direction.
|
|
|
+ */
|
|
|
+static QEMUFile *socket_get_return_path(void *opaque)
|
|
|
+{
|
|
|
+ QEMUFileSocket *forward = opaque;
|
|
|
+ QEMUFileSocket *reverse;
|
|
|
+
|
|
|
+ if (qemu_file_get_error(forward->file)) {
|
|
|
+ /* If the forward file is in error, don't try and open a return */
|
|
|
+ return NULL;
|
|
|
+ }
|
|
|
+
|
|
|
+ reverse = g_malloc0(sizeof(QEMUFileSocket));
|
|
|
+ reverse->fd = forward->fd;
|
|
|
+ /* I don't think there's a better way to tell which direction 'this' is */
|
|
|
+ if (forward->file->ops->get_buffer != NULL) {
|
|
|
+ /* being called from the read side, so we need to be able to write */
|
|
|
+ return qemu_fopen_ops(reverse, &socket_return_write_ops);
|
|
|
+ } else {
|
|
|
+ return qemu_fopen_ops(reverse, &socket_return_read_ops);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static ssize_t unix_writev_buffer(void *opaque, struct iovec *iov, int iovcnt,
|
|
|
int64_t pos)
|
|
|
{
|
|
@@ -206,18 +256,19 @@ QEMUFile *qemu_fdopen(int fd, const char *mode)
|
|
|
}
|
|
|
|
|
|
static const QEMUFileOps socket_read_ops = {
|
|
|
- .get_fd = socket_get_fd,
|
|
|
- .get_buffer = socket_get_buffer,
|
|
|
- .close = socket_close,
|
|
|
- .shut_down = socket_shutdown
|
|
|
-
|
|
|
+ .get_fd = socket_get_fd,
|
|
|
+ .get_buffer = socket_get_buffer,
|
|
|
+ .close = socket_close,
|
|
|
+ .shut_down = socket_shutdown,
|
|
|
+ .get_return_path = socket_get_return_path
|
|
|
};
|
|
|
|
|
|
static const QEMUFileOps socket_write_ops = {
|
|
|
- .get_fd = socket_get_fd,
|
|
|
- .writev_buffer = socket_writev_buffer,
|
|
|
- .close = socket_close,
|
|
|
- .shut_down = socket_shutdown
|
|
|
+ .get_fd = socket_get_fd,
|
|
|
+ .writev_buffer = socket_writev_buffer,
|
|
|
+ .close = socket_close,
|
|
|
+ .shut_down = socket_shutdown,
|
|
|
+ .get_return_path = socket_get_return_path
|
|
|
};
|
|
|
|
|
|
QEMUFile *qemu_fopen_socket(int fd, const char *mode)
|