[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 05/16] nbd: convert blockdev NBD server to use I/
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v6 05/16] nbd: convert blockdev NBD server to use I/O channels for connection setup |
Date: |
Wed, 10 Feb 2016 18:41:03 +0000 |
This converts the blockdev NBD server to use the QIOChannelSocket
class for initial listener socket setup and accepting of client
connections. Actual I/O is still being performed against the
socket file descriptor using the POSIX socket APIs.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
blockdev-nbd.c | 49 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index efc31a4..9baf883 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -18,32 +18,48 @@
#include "qmp-commands.h"
#include "trace.h"
#include "block/nbd.h"
-#include "qemu/sockets.h"
+#include "io/channel-socket.h"
-static int server_fd = -1;
+static QIOChannelSocket *server_ioc;
+static int server_watch = -1;
-static void nbd_accept(void *opaque)
+static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition,
+ gpointer opaque)
{
- struct sockaddr_in addr;
- socklen_t addr_len = sizeof(addr);
+ QIOChannelSocket *cioc;
+ int fd;
- int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len);
+ cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
+ NULL);
+ if (!cioc) {
+ return TRUE;
+ }
+
+ fd = dup(cioc->fd);
if (fd >= 0) {
nbd_client_new(NULL, fd, nbd_client_put);
}
+ object_unref(OBJECT(cioc));
+ return TRUE;
}
void qmp_nbd_server_start(SocketAddress *addr, Error **errp)
{
- if (server_fd != -1) {
+ if (server_ioc) {
error_setg(errp, "NBD server already running");
return;
}
- server_fd = socket_listen(addr, errp);
- if (server_fd != -1) {
- qemu_set_fd_handler(server_fd, nbd_accept, NULL, NULL);
+ server_ioc = qio_channel_socket_new();
+ if (qio_channel_socket_listen_sync(server_ioc, addr, errp) < 0) {
+ return;
}
+
+ server_watch = qio_channel_add_watch(QIO_CHANNEL(server_ioc),
+ G_IO_IN,
+ nbd_accept,
+ NULL,
+ NULL);
}
void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
@@ -52,7 +68,7 @@ void qmp_nbd_server_add(const char *device, bool
has_writable, bool writable,
BlockBackend *blk;
NBDExport *exp;
- if (server_fd == -1) {
+ if (!server_ioc) {
error_setg(errp, "NBD server not running");
return;
}
@@ -98,9 +114,12 @@ void qmp_nbd_server_stop(Error **errp)
{
nbd_export_close_all();
- if (server_fd != -1) {
- qemu_set_fd_handler(server_fd, NULL, NULL, NULL);
- close(server_fd);
- server_fd = -1;
+ if (server_watch != -1) {
+ g_source_remove(server_watch);
+ server_watch = -1;
+ }
+ if (server_ioc) {
+ object_unref(OBJECT(server_ioc));
+ server_ioc = NULL;
}
}
--
2.5.0
- [Qemu-devel] [PATCH v6 00/16] Implement TLS support to QEMU NBD server & client, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 02/16] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 01/16] qom: add helpers for UserCreatable object types, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 03/16] nbd: convert block client to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 04/16] nbd: convert qemu-nbd server to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 05/16] nbd: convert blockdev NBD server to use I/O channels for connection setup,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v6 07/16] nbd: invert client logic for negotiating protocol version, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 08/16] nbd: make server compliant with fixed newstyle spec, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 09/16] nbd: make client request fixed new style if advertized, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 10/16] nbd: allow setting of an export name for qemu-nbd server, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 12/16] nbd: use "" as a default export name if none provided, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 11/16] nbd: always query export list in fixed new style protocol, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 06/16] nbd: convert to using I/O channels for actual socket I/O, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 14/16] nbd: enable use of TLS with NBD block driver, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 15/16] nbd: enable use of TLS with qemu-nbd server, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 13/16] nbd: implement TLS support in the protocol negotiation, Daniel P. Berrange, 2016/02/10