starred/qemu-qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor: rename monitor_init* to monitor_new*

Browse Source 
The current "monitor_init" functions will clash with the methods of the
same name that are required by QOM. To ease the transition to QOM,
rename them out of the way.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
Tested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20260706135824.2623960-5-berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Daniel P. Berrangé
2026-07-06 14:57:52 +01:00
committed by Markus Armbruster
parent 7f0909bd80
commit fc500ce4d3
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chardev/char.c
View File

@@ -805,7 +805,7 @@ static Chardev *qemu_chr_new_from_name(const char *label, const char *filename,
if (qemu_opt_get_bool(opts, "mux", 0)) { if (qemu_opt_get_bool(opts, "mux", 0)) {
assert(permit_mux_mon); assert(permit_mux_mon);
monitor_init_hmp(chr, true, &err); monitor_new_hmp(chr, true, &err);
if (err) { if (err) {
error_report_err(err); error_report_err(err);
object_unparent(OBJECT(chr)); object_unparent(OBJECT(chr));

2
gdbstub/system.c
View File

@@ -390,7 +390,7 @@ bool gdbserver_start(const char *device, Error **errp)
/* Initialize a monitor terminal for gdb */ /* Initialize a monitor terminal for gdb */
mon_chr = qemu_chardev_new(NULL, TYPE_CHARDEV_GDB, mon_chr = qemu_chardev_new(NULL, TYPE_CHARDEV_GDB,
NULL, NULL, &error_abort); NULL, NULL, &error_abort);
monitor_init_hmp(mon_chr, false, &error_abort); monitor_new_hmp(mon_chr, false, &error_abort);
} else { } else {
qemu_chr_fe_deinit(&gdbserver_system_state.chr, true); qemu_chr_fe_deinit(&gdbserver_system_state.chr, true);
mon_chr = gdbserver_system_state.mon_chr; mon_chr = gdbserver_system_state.mon_chr;

8
include/monitor/monitor.h
View File

@@ -19,10 +19,10 @@ bool monitor_cur_is_qmp(void);
void monitor_init_globals(void); void monitor_init_globals(void);
void monitor_init_globals_core(void); void monitor_init_globals_core(void);
void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp); void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp);
void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp); void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp);
int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp); int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp);
int monitor_init_opts(QemuOpts *opts, Error **errp); int monitor_new_opts(QemuOpts *opts, Error **errp);
void monitor_cleanup(void); void monitor_cleanup(void);
int monitor_suspend(Monitor *mon); int monitor_suspend(Monitor *mon);

2
monitor/hmp.c
View File

@@ -1524,7 +1524,7 @@ static void monitor_readline_flush(void *opaque)
monitor_flush(&mon->parent_obj); monitor_flush(&mon->parent_obj);
} }
void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)
{ {
MonitorHMP *mon = g_new0(MonitorHMP, 1); MonitorHMP *mon = g_new0(MonitorHMP, 1);

10
monitor/monitor.c
View File

@@ -715,7 +715,7 @@ void monitor_init_globals(void)
aio_co_schedule(iohandler_get_aio_context(), qmp_dispatcher_co); aio_co_schedule(iohandler_get_aio_context(), qmp_dispatcher_co);
} }
int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp) int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp)
{ {
ERRP_GUARD(); ERRP_GUARD();
Chardev *chr; Chardev *chr;
@@ -732,7 +732,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)
switch (opts->mode) { switch (opts->mode) {
case MONITOR_MODE_CONTROL: case MONITOR_MODE_CONTROL:
monitor_init_qmp(chr, opts->pretty, errp); monitor_new_qmp(chr, opts->pretty, errp);
break; break;
case MONITOR_MODE_READLINE: case MONITOR_MODE_READLINE:
if (!allow_hmp) { if (!allow_hmp) {
@@ -743,7 +743,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)
error_setg(errp, "'pretty' is not compatible with HMP monitors"); error_setg(errp, "'pretty' is not compatible with HMP monitors");
return -1; return -1;
} }
monitor_init_hmp(chr, true, errp); monitor_new_hmp(chr, true, errp);
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
@@ -752,7 +752,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)
return *errp ? -1 : 0; return *errp ? -1 : 0;
} }
int monitor_init_opts(QemuOpts *opts, Error **errp) int monitor_new_opts(QemuOpts *opts, Error **errp)
{ {
Visitor *v; Visitor *v;
MonitorOptions *options; MonitorOptions *options;
@@ -765,7 +765,7 @@ int monitor_init_opts(QemuOpts *opts, Error **errp)
return -1; return -1;
} }
ret = monitor_init(options, true, errp); ret = monitor_new(options, true, errp);
qapi_free_MonitorOptions(options); qapi_free_MonitorOptions(options);
return ret; return ret;
} }

2
monitor/qmp.c
View File

@@ -513,7 +513,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)
monitor_list_append(&mon->parent_obj); monitor_list_append(&mon->parent_obj);
} }
void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp)
{ {
MonitorQMP *mon = g_new0(MonitorQMP, 1); MonitorQMP *mon = g_new0(MonitorQMP, 1);

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

@@ -330,7 +330,7 @@ static void process_options(int argc, char *argv[], bool pre_init_pass)
visit_free(v); visit_free(v);
/* TODO Catch duplicate monitor IDs */ /* TODO Catch duplicate monitor IDs */
monitor_init(monitor, false, &error_fatal); monitor_new(monitor, false, &error_fatal);
qapi_free_MonitorOptions(monitor); qapi_free_MonitorOptions(monitor);
break; break;
} }

2
stubs/monitor-internal.c
View File

@@ -8,6 +8,6 @@ int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
return -1; return -1;
} }
void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)
{ {
} }

2
system/vl.c
View File

@@ -1247,7 +1247,7 @@ static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp)
static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
{ {
return monitor_init_opts(opts, errp); return monitor_new_opts(opts, errp);
} }
static void monitor_parse(const char *str, const char *mode, bool pretty) static void monitor_parse(const char *str, const char *mode, bool pretty)