ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd: convert blockdev NBD server to use I/O channels for connection setup 

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 <berrange@redhat.com>
Message-Id: <1455129674-17255-6-git-send-email-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-02-10 18:41:03 +00:00 committed by Paolo Bonzini
parent d0d6ff584d
commit ae39827802
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
blockdev-nbd.c
View File

@ -18,32 +18,48 @@
#include "qmp-commands.h" #include "qmp-commands.h"
#include "trace.h" #include "trace.h"
#include "block/nbd.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; QIOChannelSocket *cioc;
socklen_t addr_len = sizeof(addr); 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) { if (fd >= 0) {
nbd_client_new(NULL, fd, nbd_client_put); nbd_client_new(NULL, fd, nbd_client_put);
} }
object_unref(OBJECT(cioc));
return TRUE;
} }
void qmp_nbd_server_start(SocketAddress *addr, Error **errp) void qmp_nbd_server_start(SocketAddress *addr, Error **errp)
{ {
if (server_fd != -1) { if (server_ioc) {
error_setg(errp, "NBD server already running"); error_setg(errp, "NBD server already running");
return; return;
} }
server_fd = socket_listen(addr, errp); server_ioc = qio_channel_socket_new();
if (server_fd != -1) { if (qio_channel_socket_listen_sync(server_ioc, addr, errp) < 0) {
qemu_set_fd_handler(server_fd, nbd_accept, NULL, NULL); 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, 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; BlockBackend *blk;
NBDExport *exp; NBDExport *exp;
if (server_fd == -1) { if (!server_ioc) {
error_setg(errp, "NBD server not running"); error_setg(errp, "NBD server not running");
return; return;
} }
@ -98,9 +114,12 @@ void qmp_nbd_server_stop(Error **errp)
{ {
nbd_export_close_all(); nbd_export_close_all();
if (server_fd != -1) { if (server_watch != -1) {
qemu_set_fd_handler(server_fd, NULL, NULL, NULL); g_source_remove(server_watch);
close(server_fd); server_watch = -1;
server_fd = -1; }
if (server_ioc) {
object_unref(OBJECT(server_ioc));
server_ioc = NULL;
} }
} }