[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 31/32] monitor: Loosen coupling between misc.c and monitor.c slig
From: |
Markus Armbruster |
Subject: |
[PATCH 31/32] monitor: Loosen coupling between misc.c and monitor.c slightly |
Date: |
Tue, 24 Jan 2023 13:19:45 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/misc.c | 8 +-------
monitor/monitor.c | 2 +-
storage-daemon/qemu-storage-daemon.c | 4 ++--
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/monitor/misc.c b/monitor/misc.c
index 9ddf32da97..99317a8ff4 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -135,7 +135,7 @@ compare_mon_cmd(const void *a, const void *b)
((const HMPCommand *)b)->name);
}
-static void sortcmdlist(void)
+static void __attribute__((__constructor__)) sortcmdlist(void)
{
qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1,
sizeof(*hmp_cmds),
@@ -176,9 +176,3 @@ void monitor_register_hmp_info_hrt(const char *name,
}
g_assert_not_reached();
}
-
-void monitor_init_globals(void)
-{
- monitor_init_globals_core();
- sortcmdlist();
-}
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 0a990633d8..ca233ab80f 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -719,7 +719,7 @@ static void monitor_qapi_event_init(void)
qapi_event_throttle_equal);
}
-void monitor_init_globals_core(void)
+void monitor_init_globals(void)
{
monitor_qapi_event_init();
qemu_mutex_init(&monitor_lock);
diff --git a/storage-daemon/qemu-storage-daemon.c
b/storage-daemon/qemu-storage-daemon.c
index da19498c66..0e9354faa6 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -299,7 +299,7 @@ static void process_options(int argc, char *argv[], bool
pre_init_pass)
case OPTION_DAEMONIZE:
if (os_set_daemonize(true) < 0) {
/*
- * --daemonize is parsed before monitor_init_globals_core(), so
+ * --daemonize is parsed before monitor_init_globals(), so
* error_report() does not work yet
*/
fprintf(stderr, "--daemonize not supported in this build\n");
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
qemu_add_opts(&qemu_trace_opts);
qcrypto_init(&error_fatal);
bdrv_init();
- monitor_init_globals_core();
+ monitor_init_globals();
init_qmp_commands();
if (!trace_init_backends()) {
--
2.39.0
- [PATCH 13/32] rocker: Move HMP commands from monitor to hw/net/rocker/, (continued)
- [PATCH 13/32] rocker: Move HMP commands from monitor to hw/net/rocker/, Markus Armbruster, 2023/01/24
- [PATCH 21/32] runstate: Move HMP commands from monitor/ to softmmu/, Markus Armbruster, 2023/01/24
- [PATCH 23/32] stats: Move HMP commands from monitor/ to stats/, Markus Armbruster, 2023/01/24
- [PATCH 27/32] monitor: Move monitor_putc() next to monitor_puts & external linkage, Markus Armbruster, 2023/01/24
- [PATCH 30/32] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c, Markus Armbruster, 2023/01/24
- [PATCH 18/32] migration: Move the QMP command from monitor/ to migration/, Markus Armbruster, 2023/01/24
- [PATCH 32/32] monitor: Rename misc.c to hmp-target.c, Markus Armbruster, 2023/01/24
- [PATCH 29/32] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c, Markus Armbruster, 2023/01/24
- [PATCH 15/32] net: Move HMP commands from monitor to net/, Markus Armbruster, 2023/01/24
- [PATCH 04/32] char: Factor out qmp_add_client() parts and move to chardev/, Markus Armbruster, 2023/01/24
- [PATCH 31/32] monitor: Loosen coupling between misc.c and monitor.c slightly,
Markus Armbruster <=
- [PATCH 22/32] stats: Move QMP commands from monitor/ to stats/, Markus Armbruster, 2023/01/24
- [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/, Markus Armbruster, 2023/01/24
- [PATCH 25/32] qdev: Move HMP command completion from monitor to softmmu/, Markus Armbruster, 2023/01/24
- [PATCH 17/32] migration: Move HMP commands from monitor/ to migration/, Markus Armbruster, 2023/01/24
- [PATCH 24/32] acpi: Move the QMP command from monitor/ to hw/acpi/, Markus Armbruster, 2023/01/24
- [PATCH 16/32] net: Move hmp_info_network() to net-hmp-cmds.c, Markus Armbruster, 2023/01/24