[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/35] char: Factor out qmp_add_client() parts and move to chardev
From: |
Markus Armbruster |
Subject: |
[PULL 07/35] char: Factor out qmp_add_client() parts and move to chardev/ |
Date: |
Fri, 3 Feb 2023 09:45:21 +0100 |
Code moves from MAINTAINERS section "QMP" to "Character device
backends".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-5-armbru@redhat.com>
---
include/monitor/qmp-helpers.h | 3 +++
chardev/char.c | 20 ++++++++++++++++++++
monitor/qmp-cmds.c | 13 ++-----------
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/include/monitor/qmp-helpers.h b/include/monitor/qmp-helpers.h
index 4718c63c73..318c3357a2 100644
--- a/include/monitor/qmp-helpers.h
+++ b/include/monitor/qmp-helpers.h
@@ -22,5 +22,8 @@ bool qmp_add_client_vnc(int fd, bool has_skipauth, bool
skipauth,
bool qmp_add_client_dbus_display(int fd, bool has_skipauth, bool skipauth,
bool has_tls, bool tls, Error **errp);
#endif
+bool qmp_add_client_char(int fd, bool has_skipauth, bool skipauth,
+ bool has_tls, bool tls, const char *protocol,
+ Error **errp);
#endif
diff --git a/chardev/char.c b/chardev/char.c
index 87ab6efbcc..11eab7764c 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "monitor/monitor.h"
+#include "monitor/qmp-helpers.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qemu/qemu-print.h"
@@ -1166,6 +1167,25 @@ void qmp_chardev_send_break(const char *id, Error **errp)
qemu_chr_be_event(chr, CHR_EVENT_BREAK);
}
+bool qmp_add_client_char(int fd, bool has_skipauth, bool skipauth,
+ bool has_tls, bool tls, const char *protocol,
+ Error **errp)
+{
+ Chardev *s = qemu_chr_find(protocol);
+
+ if (!s) {
+ error_setg(errp, "protocol '%s' is invalid", protocol);
+ close(fd);
+ return false;
+ }
+ if (qemu_chr_add_client(s, fd) < 0) {
+ error_setg(errp, "failed to add client");
+ close(fd);
+ return false;
+ }
+ return true;
+}
+
/*
* Add a timeout callback for the chardev (in milliseconds), return
* the GSource object created. Please use this to add timeout hook for
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 743849c0b5..e5ab77f6c6 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -17,7 +17,6 @@
#include "monitor/monitor.h"
#include "monitor/qmp-helpers.h"
#include "sysemu/sysemu.h"
-#include "chardev/char.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
#include "sysemu/runstate-action.h"
@@ -174,7 +173,6 @@ void qmp_add_client(const char *protocol, const char
*fdname,
{ "@dbus-display", qmp_add_client_dbus_display },
#endif
};
- Chardev *s;
int fd, i;
fd = monitor_get_fd(monitor_cur(), fdname, errp);
@@ -192,16 +190,9 @@ void qmp_add_client(const char *protocol, const char
*fdname,
}
}
- s = qemu_chr_find(protocol);
- if (!s) {
- error_setg(errp, "protocol '%s' is invalid", protocol);
+ if (!qmp_add_client_char(fd, has_skipauth, skipauth, has_tls, tls,
+ protocol, errp)) {
close(fd);
- return;
- }
- if (qemu_chr_add_client(s, fd) < 0) {
- error_setg(errp, "failed to add client");
- close(fd);
- return;
}
}
--
2.39.0
- [PULL 34/35] monitor: Loosen coupling between misc.c and monitor.c slightly, (continued)
- [PULL 34/35] monitor: Loosen coupling between misc.c and monitor.c slightly, Markus Armbruster, 2023/02/03
- [PULL 20/35] migration: Move HMP commands from monitor/ to migration/, Markus Armbruster, 2023/02/03
- [PULL 05/35] audio: Move HMP commands from monitor/ to audio/, Markus Armbruster, 2023/02/03
- [PULL 26/35] stats: Move HMP commands from monitor/ to stats/, Markus Armbruster, 2023/02/03
- [PULL 23/35] tpm: Move HMP commands from monitor/ to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 17/35] hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma(), Markus Armbruster, 2023/02/03
- [PULL 16/35] rocker: Move HMP commands from monitor to hw/net/rocker/, Markus Armbruster, 2023/02/03
- [PULL 32/35] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c, Markus Armbruster, 2023/02/03
- [PULL 19/35] net: Move hmp_info_network() to net-hmp-cmds.c, Markus Armbruster, 2023/02/03
- [PULL 22/35] virtio: Move HMP commands from monitor/ to hw/virtio/, Markus Armbruster, 2023/02/03
- [PULL 07/35] char: Factor out qmp_add_client() parts and move to chardev/,
Markus Armbruster <=
- [PULL 10/35] hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h, Markus Armbruster, 2023/02/03
- [PULL 29/35] monitor: Split file descriptor passing stuff off misc.c, Markus Armbruster, 2023/02/03
- [PULL 27/35] acpi: Move the QMP command from monitor/ to hw/acpi/, Markus Armbruster, 2023/02/03
- [PULL 06/35] char: Move HMP commands from monitor/ to chardev/, Markus Armbruster, 2023/02/03
- [PULL 09/35] readline: Extract readline_add_completion_of() from monitor, Markus Armbruster, 2023/02/03
- [PULL 13/35] machine: Move HMP commands from monitor/ to hw/core/, Markus Armbruster, 2023/02/03
- Re: [PULL 00/35] Monitor patches for 2023-02-03, Peter Maydell, 2023/02/03