[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/4] char: Factor out qemu_chr_print_types()
From: |
Markus Armbruster |
Subject: |
[PATCH 2/4] char: Factor out qemu_chr_print_types() |
Date: |
Mon, 26 Oct 2020 11:10:03 +0100 |
From: Kevin Wolf <kwolf@redhat.com>
We'll want to call the same from a non-QemuOpts code path.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201023161312.460406-3-kwolf@redhat.com>
---
include/chardev/char.h | 1 +
chardev/char.c | 16 ++++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/include/chardev/char.h b/include/chardev/char.h
index db42f0a8c6..3b91645081 100644
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -212,6 +212,7 @@ void qemu_chr_be_update_read_handlers(Chardev *s,
*/
void qemu_chr_be_event(Chardev *s, QEMUChrEvent event);
+void qemu_chr_print_types(void);
int qemu_chr_add_client(Chardev *s, int fd);
Chardev *qemu_chr_find(const char *name);
diff --git a/chardev/char.c b/chardev/char.c
index 78553125d3..4d188bfa6f 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -633,6 +633,15 @@ ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Error
**errp)
return backend;
}
+void qemu_chr_print_types(void)
+{
+ g_autoptr(GString) str = g_string_new("");
+
+ chardev_name_foreach(help_string_append, str);
+
+ qemu_printf("Available chardev backend types: %s\n", str->str);
+}
+
Chardev *qemu_chr_new_from_opts(QemuOpts *opts, GMainContext *context,
Error **errp)
{
@@ -644,12 +653,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
GMainContext *context,
char *bid = NULL;
if (name && is_help_option(name)) {
- GString *str = g_string_new("");
-
- chardev_name_foreach(help_string_append, str);
-
- qemu_printf("Available chardev backend types: %s\n", str->str);
- g_string_free(str, true);
+ qemu_chr_print_types();
return NULL;
}
--
2.26.2
- [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Markus Armbruster, 2020/10/26
- [PATCH 1/4] char/stdio: Fix QMP default for 'signal', Markus Armbruster, 2020/10/26
- [PATCH 4/4] qemu-storage-daemon: QAPIfy --chardev, Markus Armbruster, 2020/10/26
- [PATCH 2/4] char: Factor out qemu_chr_print_types(),
Markus Armbruster <=
- [PATCH 3/4] char: Flat alternative to overly nested chardev-add arguments, Markus Armbruster, 2020/10/26
- Re: [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Paolo Bonzini, 2020/10/27
- Re: [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Markus Armbruster, 2020/10/28
- Re: [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Kevin Wolf, 2020/10/28
- Re: [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Paolo Bonzini, 2020/10/28
- Re: [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Kevin Wolf, 2020/10/28
- Re: [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Paolo Bonzini, 2020/10/28
- Re: [PATCH 0/4] qemu-storage-daemon: QAPIfy --chardev the stupid way, Kevin Wolf, 2020/10/28