@@ -34,13 +34,6 @@
/* MUX driver for serial I/O splitting */
-/*
- * Set to false by suspend_mux_open. Open events are delayed until
- * resume_mux_open. Usually suspend_mux_open is called before
- * command line processing and resume_mux_open afterwards.
- */
-static bool muxes_opened = true;
-
/* Called with chr_write_lock held. */
static int mux_chr_write(Chardev *chr, const uint8_t *buf, int len)
{
@@ -248,15 +241,10 @@ static void mux_chr_read(void *opaque, const uint8_t *buf, int size)
}
}
-void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event)
+void mux_fe_chr_send_all_event(MuxFeChardev *d, QEMUChrEvent event)
{
- MuxFeChardev *d = MUX_FE_CHARDEV(chr);
int bit;
- if (!muxes_opened) {
- return;
- }
-
/* Send the event to all registered listeners */
bit = -1;
while ((bit = find_next_bit(&d->mux_bitset, MAX_MUX, bit + 1)) < MAX_MUX) {
@@ -381,7 +369,7 @@ static void qemu_chr_open_mux(Chardev *chr,
/* only default to opened state if we've realized the initial
* set of muxes
*/
- *be_opened = muxes_opened;
+ *be_opened = mux_is_opened();
qemu_chr_fe_init(&d->chr, drv, errp);
}
@@ -401,53 +389,6 @@ static void qemu_chr_parse_mux(QemuOpts *opts, ChardevBackend *backend,
mux->chardev = g_strdup(chardev);
}
-/**
- * Called after processing of default and command-line-specified
- * chardevs to deliver CHR_EVENT_OPENED events to any FEs attached
- * to a mux chardev. This is done here to ensure that
- * output/prompts/banners are only displayed for the FE that has
- * focus when initial command-line processing/machine init is
- * completed.
- *
- * After this point, any new FE attached to any new or existing
- * mux will receive CHR_EVENT_OPENED notifications for the BE
- * immediately.
- */
-static void open_muxes(Chardev *chr)
-{
- /* send OPENED to all already-attached FEs */
- mux_chr_send_all_event(chr, CHR_EVENT_OPENED);
-
- /*
- * mark mux as OPENED so any new FEs will immediately receive
- * OPENED event
- */
- chr->be_open = 1;
-}
-
-void suspend_mux_open(void)
-{
- muxes_opened = false;
-}
-
-static int chardev_options_parsed_cb(Object *child, void *opaque)
-{
- Chardev *chr = (Chardev *)child;
-
- if (!chr->be_open && CHARDEV_IS_MUX_FE(chr)) {
- open_muxes(chr);
- }
-
- return 0;
-}
-
-void resume_mux_open(void)
-{
- muxes_opened = true;
- object_child_foreach(get_chardevs_root(),
- chardev_options_parsed_cb, NULL);
-}
-
static void char_mux_class_init(ObjectClass *oc, void *data)
{
ChardevClass *cc = CHARDEV_CLASS(oc);
@@ -43,6 +43,13 @@
#include "chardev-internal.h"
+/*
+ * Set to false by mux_suspend_open(). Open events are delayed until
+ * mux_resume_open(). Usually mux_suspend_open() is called before
+ * command line processing and mux_resume_open() afterwards.
+ */
+static bool muxes_opened = true;
+
/***********************************************************/
/* character device */
@@ -1259,6 +1266,71 @@ void qemu_chr_cleanup(void)
object_unparent(get_chardevs_root());
}
+/**
+ * Called after processing of default and command-line-specified
+ * chardevs to deliver CHR_EVENT_OPENED events to any FEs attached
+ * to a mux chardev. This is done here to ensure that
+ * output/prompts/banners are only displayed for the FE that has
+ * focus when initial command-line processing/machine init is
+ * completed.
+ *
+ * After this point, any new FE attached to any new or existing
+ * mux will receive CHR_EVENT_OPENED notifications for the BE
+ * immediately.
+ */
+static void open_muxes(Chardev *chr)
+{
+ /* send OPENED to all already-attached FEs */
+ mux_chr_send_all_event(chr, CHR_EVENT_OPENED);
+
+ /*
+ * mark mux as OPENED so any new FEs will immediately receive
+ * OPENED event
+ */
+ chr->be_open = 1;
+}
+
+void mux_suspend_open(void)
+{
+ muxes_opened = false;
+}
+
+static int chardev_options_parsed_cb(Object *child, void *opaque)
+{
+ Chardev *chr = (Chardev *)child;
+
+ if (!chr->be_open && CHARDEV_IS_MUX_FE(chr)) {
+ open_muxes(chr);
+ }
+
+ return 0;
+}
+
+void mux_resume_open(void)
+{
+ muxes_opened = true;
+ object_child_foreach(get_chardevs_root(),
+ chardev_options_parsed_cb, NULL);
+}
+
+bool mux_is_opened(void)
+{
+ return muxes_opened;
+}
+
+void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event)
+{
+ if (!mux_is_opened()) {
+ return;
+ }
+
+ if (CHARDEV_IS_MUX_FE(chr)) {
+ MuxFeChardev *d = MUX_FE_CHARDEV(chr);
+
+ mux_fe_chr_send_all_event(d, event);
+ }
+}
+
static void register_types(void)
{
type_register_static(&char_type_info);
@@ -65,6 +65,9 @@ bool mux_chr_detach_frontend(MuxFeChardev *d, unsigned int tag);
void mux_set_focus(Chardev *chr, unsigned int focus);
void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event);
+/* Mux type dependent calls */
+void mux_fe_chr_send_all_event(MuxFeChardev *d, QEMUChrEvent event);
+
Object *get_chardevs_root(void);
#endif /* CHARDEV_INTERNAL_H */
@@ -317,7 +317,8 @@ extern int term_escape_char;
GSource *qemu_chr_timeout_add_ms(Chardev *chr, guint ms,
GSourceFunc func, void *private);
-void suspend_mux_open(void);
-void resume_mux_open(void);
+bool mux_is_opened(void);
+void mux_suspend_open(void);
+void mux_resume_open(void);
#endif
@@ -3679,7 +3679,7 @@ void qemu_init(int argc, char **argv)
qemu_create_machine(machine_opts_dict);
- suspend_mux_open();
+ mux_suspend_open();
qemu_disable_default_devices();
qemu_setup_display();
@@ -3757,5 +3757,5 @@ void qemu_init(int argc, char **argv)
qemu_init_displays();
accel_setup_post(current_machine);
os_setup_post();
- resume_mux_open();
+ mux_resume_open();
}
The suspend/resume open multiplexer calls are generic and will be used for frontend (current mux) and backend (will follow) implementations. Move them away from the `char-mux-fe.c` to more generic `char.c` file. Also for the sake of clarity these renames were made: s/suspend_mux_open/mux_suspend_open/g s/resume_mux_open/mux_resume_open/g No functional changes are made. Signed-off-by: Roman Penyaev <r.peniaev@gmail.com> Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com> Cc: qemu-devel@nongnu.org --- chardev/char-mux-fe.c | 63 ++------------------------------- chardev/char.c | 72 ++++++++++++++++++++++++++++++++++++++ chardev/chardev-internal.h | 3 ++ include/chardev/char.h | 5 +-- system/vl.c | 4 +-- 5 files changed, 82 insertions(+), 65 deletions(-)