mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
ui/vc: do not parse VC-specific options in Spice and GTK
In commit6f974c843c
("gtk: overwrite the console.c char driver"), I shared the VC console parse handler with GTK. And later on in commitd8aec9d9
("display: add -display spice-app launching a Spice client"), I also used it to handle spice-app VC. This is not necessary, the VC console options (width/height/cols/rows) are specific, and unused by tty-level GTK/Spice VC. This is not a breaking change, as those options are still being parsed by QAPI ChardevVC. Adjust the documentation about it. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20230830093843.3531473-44-marcandre.lureau@redhat.com>
This commit is contained in:
parent
322dae4bc8
commit
32aa1f8dee
|
@ -320,7 +320,4 @@ GSource *qemu_chr_timeout_add_ms(Chardev *chr, guint ms,
|
|||
void suspend_mux_open(void);
|
||||
void resume_mux_open(void);
|
||||
|
||||
/* console.c */
|
||||
void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -390,6 +390,10 @@
|
|||
#
|
||||
# @rows: console height, in chars
|
||||
#
|
||||
# Note: the options are only effective when the VNC or SDL graphical
|
||||
# display backend is active. They are ignored with the GTK, Spice, VNC
|
||||
# and D-Bus display backends.
|
||||
#
|
||||
# Since: 1.5
|
||||
##
|
||||
{ 'struct': 'ChardevVC',
|
||||
|
|
|
@ -2708,7 +2708,7 @@ void qemu_display_help(void)
|
|||
}
|
||||
}
|
||||
|
||||
void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp)
|
||||
static void vc_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)
|
||||
{
|
||||
int val;
|
||||
ChardevVC *vc;
|
||||
|
@ -2746,7 +2746,7 @@ static void char_vc_class_init(ObjectClass *oc, void *data)
|
|||
{
|
||||
ChardevClass *cc = CHARDEV_CLASS(oc);
|
||||
|
||||
cc->parse = qemu_chr_parse_vc;
|
||||
cc->parse = vc_chr_parse;
|
||||
cc->open = vc_chr_open;
|
||||
cc->chr_write = vc_chr_write;
|
||||
cc->chr_accept_input = vc_chr_accept_input;
|
||||
|
|
1
ui/gtk.c
1
ui/gtk.c
|
@ -1860,7 +1860,6 @@ static void char_gd_vc_class_init(ObjectClass *oc, void *data)
|
|||
{
|
||||
ChardevClass *cc = CHARDEV_CLASS(oc);
|
||||
|
||||
cc->parse = qemu_chr_parse_vc;
|
||||
cc->open = gd_vc_open;
|
||||
cc->chr_write = gd_vc_chr_write;
|
||||
cc->chr_accept_input = gd_vc_chr_accept_input;
|
||||
|
|
|
@ -96,6 +96,11 @@ static void vc_chr_set_echo(Chardev *chr, bool echo)
|
|||
/* TODO: set echo for frontends QMP and qtest */
|
||||
}
|
||||
|
||||
static void vc_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)
|
||||
{
|
||||
/* fqdn is dealt with in vc_chr_open() */
|
||||
}
|
||||
|
||||
static void char_vc_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
VCChardevClass *vc = CHARDEV_VC_CLASS(oc);
|
||||
|
@ -103,7 +108,7 @@ static void char_vc_class_init(ObjectClass *oc, void *data)
|
|||
|
||||
vc->parent_open = cc->open;
|
||||
|
||||
cc->parse = qemu_chr_parse_vc;
|
||||
cc->parse = vc_chr_parse;
|
||||
cc->open = vc_chr_open;
|
||||
cc->chr_set_echo = vc_chr_set_echo;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue