From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PULL 22/32] socket: add listen feature
Date: Tue, 28 Jun 2016 19:33:52 +0200 [thread overview]
Message-ID: <1467135242-874-23-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1467135242-874-1-git-send-email-pbonzini@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Add a flag to tell whether the channel socket is listening.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1466105332-10285-3-git-send-email-marcandre.lureau@redhat.com>
Acked-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/io/channel.h | 1 +
io/channel-socket.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/include/io/channel.h b/include/io/channel.h
index d37acd2..e52f059 100644
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -42,6 +42,7 @@ typedef enum QIOChannelFeature QIOChannelFeature;
enum QIOChannelFeature {
QIO_CHANNEL_FEATURE_FD_PASS = (1 << 0),
QIO_CHANNEL_FEATURE_SHUTDOWN = (1 << 1),
+ QIO_CHANNEL_FEATURE_LISTEN = (1 << 2),
};
diff --git a/io/channel-socket.c b/io/channel-socket.c
index ca8bc20..1cd5848 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -71,6 +71,9 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc,
int fd,
Error **errp)
{
+ int val;
+ socklen_t len = sizeof(val);
+
if (sioc->fd != -1) {
error_setg(errp, "Socket is already open");
return -1;
@@ -106,6 +109,10 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc,
ioc->features |= (1 << QIO_CHANNEL_FEATURE_FD_PASS);
}
#endif /* WIN32 */
+ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &val, &len) == 0 && val) {
+ QIOChannel *ioc = QIO_CHANNEL(sioc);
+ ioc->features |= (1 << QIO_CHANNEL_FEATURE_LISTEN);
+ }
return 0;
--
2.7.4
next prev parent reply other threads:[~2016-06-28 17:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-28 17:33 [Qemu-devel] [PULL 00/32] Misc patches for QEMU soft freeze Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 01/32] ide: move headers to include folder Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 02/32] pcspk: convert "pit" property type from ptr to link Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 03/32] vmport: identify vmport type by macro TYPE_VMPORT Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 04/32] pflash: make TYPE_CFI_PFLASH0{1, 2} macros public Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 05/32] Q35: implement property interfece to several parameters Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 06/32] pc_q35: configure Q35 instance using properties Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 07/32] pckbd: handle A20 IRQ as GPIO Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 08/32] port92: " Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 09/32] ICH9 SMB: make TYPE_ICH9_SMB_DEVICE macro public Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 10/32] ich9: call ich9_lpc_update_pic for disabled pirqs Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 11/32] ich9: clean up ich9_lpc_update_pic/ich9_lpc_update_apic and callers Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 12/32] ich9: unify pic and ioapic IRQ vectors Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 13/32] ICH9 LPC: handle GSI as qdev GPIO Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 14/32] ICH9 LPC: move call of isa_bus_irqs to 'realize' method Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 15/32] isa: introduce wrapper isa_connect_gpio_out Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 16/32] MC146818 RTC: add GPIO access to output IRQ Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 17/32] scsi: esp: fix migration Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 18/32] vnc: generalize "VNC server running on ..." message Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 19/32] pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 20/32] target-*: Don't redefine cpu_exec() Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 21/32] char: clean up remaining chardevs when leaving Paolo Bonzini
2016-07-01 12:34 ` Andrew Jones
2016-07-01 15:18 ` Paolo Bonzini
2016-07-01 15:29 ` Laszlo Ersek
2016-06-28 17:33 ` Paolo Bonzini [this message]
2016-06-28 17:33 ` [Qemu-devel] [PULL 23/32] socket: unlink unix socket on remove Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 24/32] iscsi: fix assertion in is_sector_request_lun_aligned Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 25/32] serial: make tsr_retry unsigned Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 26/32] serial: simplify tsr_retry reset Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 27/32] serial: separate serial_xmit and serial_watch_cb Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 28/32] char: change qemu_chr_fe_add_watch to return unsigned Paolo Bonzini
2016-06-28 17:33 ` [Qemu-devel] [PULL 29/32] serial: remove watch on reset Paolo Bonzini
2016-06-28 17:34 ` [Qemu-devel] [PULL 30/32] serial: reinstate watch after migration Paolo Bonzini
2016-06-28 17:34 ` [Qemu-devel] [PULL 31/32] ich9: implement ACPI_EN register Paolo Bonzini
2016-06-28 17:34 ` [Qemu-devel] [PULL 32/32] ich9: implement SCI_IRQ_SEL register Paolo Bonzini
2016-06-29 9:42 ` [Qemu-devel] [PULL 00/32] Misc patches for QEMU soft freeze Peter Maydell
2016-06-29 10:42 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467135242-874-23-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).