152 lines
5.9 KiB
Diff
152 lines
5.9 KiB
Diff
From c7029ffd110bdd4bab6847cd485898dbc5acf5f3 Mon Sep 17 00:00:00 2001
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
Date: Wed, 4 Sep 2019 10:26:05 +0100
|
|
Subject: [PATCH 5/8] socket: Add num connections to
|
|
qio_net_listener_open_sync()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Juan Quintela <quintela@redhat.com>
|
|
Message-id: <20190904102606.15744-5-quintela@redhat.com>
|
|
Patchwork-id: 90269
|
|
O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH 4/5] socket: Add num connections to qio_net_listener_open_sync()
|
|
Bugzilla: 1726898
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit fc8135c63021e8e442a7a894e5434f210614a73c)
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
blockdev-nbd.c | 2 +-
|
|
chardev/char-socket.c | 2 +-
|
|
include/io/net-listener.h | 2 ++
|
|
io/net-listener.c | 3 ++-
|
|
migration/socket.c | 2 +-
|
|
qemu-nbd.c | 2 +-
|
|
ui/vnc.c | 4 ++--
|
|
7 files changed, 10 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
|
|
index 66eebab..06041a2 100644
|
|
--- a/blockdev-nbd.c
|
|
+++ b/blockdev-nbd.c
|
|
@@ -102,7 +102,7 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds,
|
|
qio_net_listener_set_name(nbd_server->listener,
|
|
"nbd-listener");
|
|
|
|
- if (qio_net_listener_open_sync(nbd_server->listener, addr, errp) < 0) {
|
|
+ if (qio_net_listener_open_sync(nbd_server->listener, addr, 1, errp) < 0) {
|
|
goto error;
|
|
}
|
|
|
|
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
|
|
index 7ca5d97..8c7c9da 100644
|
|
--- a/chardev/char-socket.c
|
|
+++ b/chardev/char-socket.c
|
|
@@ -1160,7 +1160,7 @@ static int qmp_chardev_open_socket_server(Chardev *chr,
|
|
qio_net_listener_set_name(s->listener, name);
|
|
g_free(name);
|
|
|
|
- if (qio_net_listener_open_sync(s->listener, s->addr, errp) < 0) {
|
|
+ if (qio_net_listener_open_sync(s->listener, s->addr, 1, errp) < 0) {
|
|
object_unref(OBJECT(s->listener));
|
|
s->listener = NULL;
|
|
return -1;
|
|
diff --git a/include/io/net-listener.h b/include/io/net-listener.h
|
|
index 8081ac5..fb10170 100644
|
|
--- a/include/io/net-listener.h
|
|
+++ b/include/io/net-listener.h
|
|
@@ -95,6 +95,7 @@ void qio_net_listener_set_name(QIONetListener *listener,
|
|
* qio_net_listener_open_sync:
|
|
* @listener: the network listener object
|
|
* @addr: the address to listen on
|
|
+ * @num: the amount of expected connections
|
|
* @errp: pointer to a NULL initialized error object
|
|
*
|
|
* Synchronously open a listening connection on all
|
|
@@ -104,6 +105,7 @@ void qio_net_listener_set_name(QIONetListener *listener,
|
|
*/
|
|
int qio_net_listener_open_sync(QIONetListener *listener,
|
|
SocketAddress *addr,
|
|
+ int num,
|
|
Error **errp);
|
|
|
|
/**
|
|
diff --git a/io/net-listener.c b/io/net-listener.c
|
|
index dc81150..5d8a226 100644
|
|
--- a/io/net-listener.c
|
|
+++ b/io/net-listener.c
|
|
@@ -62,6 +62,7 @@ static gboolean qio_net_listener_channel_func(QIOChannel *ioc,
|
|
|
|
int qio_net_listener_open_sync(QIONetListener *listener,
|
|
SocketAddress *addr,
|
|
+ int num,
|
|
Error **errp)
|
|
{
|
|
QIODNSResolver *resolver = qio_dns_resolver_get_instance();
|
|
@@ -82,7 +83,7 @@ int qio_net_listener_open_sync(QIONetListener *listener,
|
|
for (i = 0; i < nresaddrs; i++) {
|
|
QIOChannelSocket *sioc = qio_channel_socket_new();
|
|
|
|
- if (qio_channel_socket_listen_sync(sioc, resaddrs[i], 1,
|
|
+ if (qio_channel_socket_listen_sync(sioc, resaddrs[i], num,
|
|
err ? NULL : &err) == 0) {
|
|
success = true;
|
|
|
|
diff --git a/migration/socket.c b/migration/socket.c
|
|
index 98efdc0..e63f5e1 100644
|
|
--- a/migration/socket.c
|
|
+++ b/migration/socket.c
|
|
@@ -181,7 +181,7 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
|
|
|
|
qio_net_listener_set_name(listener, "migration-socket-listener");
|
|
|
|
- if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
|
|
+ if (qio_net_listener_open_sync(listener, saddr, 1, errp) < 0) {
|
|
object_unref(OBJECT(listener));
|
|
return;
|
|
}
|
|
diff --git a/qemu-nbd.c b/qemu-nbd.c
|
|
index a8cb39e..e6a52bf 100644
|
|
--- a/qemu-nbd.c
|
|
+++ b/qemu-nbd.c
|
|
@@ -1054,7 +1054,7 @@ int main(int argc, char **argv)
|
|
server = qio_net_listener_new();
|
|
if (socket_activation == 0) {
|
|
saddr = nbd_build_socket_address(sockpath, bindto, port);
|
|
- if (qio_net_listener_open_sync(server, saddr, &local_err) < 0) {
|
|
+ if (qio_net_listener_open_sync(server, saddr, 1, &local_err) < 0) {
|
|
object_unref(OBJECT(server));
|
|
error_report_err(local_err);
|
|
exit(EXIT_FAILURE);
|
|
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
index 933dc36..b042593 100644
|
|
--- a/ui/vnc.c
|
|
+++ b/ui/vnc.c
|
|
@@ -3760,7 +3760,7 @@ static int vnc_display_listen(VncDisplay *vd,
|
|
qio_net_listener_set_name(vd->listener, "vnc-listen");
|
|
for (i = 0; i < nsaddr; i++) {
|
|
if (qio_net_listener_open_sync(vd->listener,
|
|
- saddr[i],
|
|
+ saddr[i], 1,
|
|
errp) < 0) {
|
|
return -1;
|
|
}
|
|
@@ -3775,7 +3775,7 @@ static int vnc_display_listen(VncDisplay *vd,
|
|
qio_net_listener_set_name(vd->wslistener, "vnc-ws-listen");
|
|
for (i = 0; i < nwsaddr; i++) {
|
|
if (qio_net_listener_open_sync(vd->wslistener,
|
|
- wsaddr[i],
|
|
+ wsaddr[i], 1,
|
|
errp) < 0) {
|
|
return -1;
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|