ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitor: Loosen coupling between misc.c and monitor.c slightly 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-32-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2023-01-24 13:19:45 +01:00
parent e6e108d138
commit 9d2b5f2ce4
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monitor/misc.c
View File

@ -135,7 +135,7 @@ compare_mon_cmd(const void *a, const void *b)
((const HMPCommand *)b)->name); ((const HMPCommand *)b)->name);
} }
static void sortcmdlist(void) static void __attribute__((__constructor__)) sortcmdlist(void)
{ {
qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1, qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1,
sizeof(*hmp_cmds), sizeof(*hmp_cmds),
@ -176,9 +176,3 @@ void monitor_register_hmp_info_hrt(const char *name,
} }
g_assert_not_reached(); g_assert_not_reached();
} }
void monitor_init_globals(void)
{
monitor_init_globals_core();
sortcmdlist();
}

2
monitor/monitor.c
View File

@ -720,7 +720,7 @@ static void monitor_qapi_event_init(void)
qapi_event_throttle_equal); qapi_event_throttle_equal);
} }
void monitor_init_globals_core(void) void monitor_init_globals(void)
{ {
monitor_qapi_event_init(); monitor_qapi_event_init();
qemu_mutex_init(&monitor_lock); qemu_mutex_init(&monitor_lock);

4
storage-daemon/qemu-storage-daemon.c
View File

@ -299,7 +299,7 @@ static void process_options(int argc, char *argv[], bool pre_init_pass)
case OPTION_DAEMONIZE: case OPTION_DAEMONIZE:
if (os_set_daemonize(true) < 0) { 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 * error_report() does not work yet
*/ */
fprintf(stderr, "--daemonize not supported in this build\n"); 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); qemu_add_opts(&qemu_trace_opts);
qcrypto_init(&error_fatal); qcrypto_init(&error_fatal);
bdrv_init(); bdrv_init();
monitor_init_globals_core(); monitor_init_globals();
init_qmp_commands(); init_qmp_commands();
if (!trace_init_backends()) { if (!trace_init_backends()) {