From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PULL 33/41] char: add chr_wait_connected callback
Date: Fri, 29 Jul 2016 06:17:00 +0300 [thread overview]
Message-ID: <1469762011-7902-34-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
A function to wait on the backend to be connected, to be used in the
following patches.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/sysemu/char.h | 8 ++++++++
qemu-char.c | 9 +++++++++
2 files changed, 17 insertions(+)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 0ea9eac..ee7e554 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -70,6 +70,7 @@ struct CharDriverState {
int (*get_msgfds)(struct CharDriverState *s, int* fds, int num);
int (*set_msgfds)(struct CharDriverState *s, int *fds, int num);
int (*chr_add_client)(struct CharDriverState *chr, int fd);
+ int (*chr_wait_connected)(struct CharDriverState *chr, Error **errp);
IOEventHandler *chr_event;
IOCanReadHandler *chr_can_read;
IOReadHandler *chr_read;
@@ -159,6 +160,13 @@ void qemu_chr_disconnect(CharDriverState *chr);
void qemu_chr_cleanup(void);
/**
+ * @qemu_chr_wait_connected:
+ *
+ * Wait for characted backend to be connected.
+ */
+int qemu_chr_wait_connected(CharDriverState *chr, Error **errp);
+
+/**
* @qemu_chr_new_noreplay:
*
* Create a new character backend from a URI.
diff --git a/qemu-char.c b/qemu-char.c
index 1274f50..6eba615 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3139,6 +3139,15 @@ static gboolean tcp_chr_accept(QIOChannel *channel,
return TRUE;
}
+int qemu_chr_wait_connected(CharDriverState *chr, Error **errp)
+{
+ if (chr->chr_wait_connected) {
+ return chr->chr_wait_connected(chr, errp);
+ }
+
+ return 0;
+}
+
static void tcp_chr_close(CharDriverState *chr)
{
TCPCharDriver *s = chr->opaque;
--
MST
next prev parent reply other threads:[~2016-07-29 3:17 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 3:14 [Qemu-devel] [PULL 00/41] pc, pci, virtio: cleanups, fixes Michael S. Tsirkin
2016-07-29 3:14 ` [Qemu-devel] [PULL 01/41] pcie: fix link active status bit migration Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 02/41] hw/pcie-root-port: Fix PCIe root port initialization Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 03/41] hw/pxb: declare pxb devices as not hot-pluggable Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 04/41] hw/acpi: fix a DSDT table issue when a pxb is present Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 05/41] acpi: refactor pxb crs computation Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 06/41] hw/apci: handle 64-bit MMIO regions correctly Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 07/41] hw/pci-bridge: Convert pxb initialization functions to Error Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 08/41] apb: convert init to realize Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 09/41] hw/virtio-pci: fix virtio behaviour Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 10/41] virtio: check vring descriptor buffer length Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 11/41] misc: indentation Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 12/41] vhost-user: minor simplification Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 13/41] vhost-user: disconnect on HUP Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 14/41] vhost: don't assume opaque is a fd, use backend cleanup Michael S. Tsirkin
2016-07-29 3:15 ` [Qemu-devel] [PULL 15/41] vhost: make vhost_log_put() idempotent Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 16/41] vhost: assert the log was cleaned up Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 17/41] vhost: fix cleanup on not fully initialized device Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 18/41] vhost: make vhost_dev_cleanup() idempotent Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 19/41] vhost-net: always call vhost_dev_cleanup() on failure Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 20/41] vhost: fix calling vhost_dev_cleanup() after vhost_dev_init() Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 21/41] vhost: do not assert() on vhost_ops failure Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 22/41] vhost: add missing VHOST_OPS_DEBUG Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 23/41] vhost: use error_report() instead of fprintf(stderr, ...) Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 24/41] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 25/41] vhost-user: call set_msgfds unconditionally Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 26/41] vhost-user: check qemu_chr_fe_set_msgfds() return value Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 27/41] vhost-user: check vhost_user_{read, write}() " Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 28/41] vhost-user: keep vhost_net after a disconnection Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 29/41] vhost-user: add get_vhost_net() assertions Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 30/41] Revert "vhost-net: do not crash if backend is not present" Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 31/41] vhost-net: vhost_migration_done is vhost-user specific Michael S. Tsirkin
2016-07-29 3:16 ` [Qemu-devel] [PULL 32/41] vhost: add assert() to check runtime behaviour Michael S. Tsirkin
2016-07-29 3:17 ` Michael S. Tsirkin [this message]
2016-07-29 3:17 ` [Qemu-devel] [PULL 34/41] char: add and use tcp_chr_wait_connected Michael S. Tsirkin
2016-07-29 3:17 ` [Qemu-devel] [PULL 35/41] vhost-user: wait until backend init is completed Michael S. Tsirkin
2016-07-29 3:17 ` [Qemu-devel] [PULL 36/41] tests: plug some leaks in virtio-net-test Michael S. Tsirkin
2016-07-29 3:17 ` [Qemu-devel] [PULL 37/41] tests: fix vhost-user-test leak Michael S. Tsirkin
2016-07-29 3:17 ` [Qemu-devel] [PULL 38/41] vhost-user: add error report in vhost_user_write() Michael S. Tsirkin
2016-07-29 3:17 ` [Qemu-devel] [PULL 39/41] vhost: add vhost_net_set_backend() Michael S. Tsirkin
2016-07-29 3:17 ` [Qemu-devel] [PULL 40/41] vhost: do not update last avail idx on get_vring_base() failure Michael S. Tsirkin
2016-07-29 3:17 ` [Qemu-devel] [PULL 41/41] mptsas: Fix a migration compatible issue Michael S. Tsirkin
2016-07-29 11:36 ` [Qemu-devel] [PULL 00/41] pc, pci, virtio: cleanups, fixes Peter Maydell
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=1469762011-7902-34-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--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).