haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qemu-char: convert vc backend to data-driven creation

Browse source 
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-09-29 15:49:06 +02:00
parent 68145e178a
commit fa19d02539
6 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/sysemu/char.h
View file

@ -357,8 +357,7 @@ extern int term_escape_char;
CharDriverState *qemu_char_get_next_serial(void); CharDriverState *qemu_char_get_next_serial(void);
/* console.c */ /* console.c */
typedef CharDriverState *(VcHandler)(ChardevVC *vc); typedef CharDriverState *(VcHandler)(ChardevVC *vc, Error **errp);
void register_vc_handler(VcHandler *handler); void register_vc_handler(VcHandler *handler);
CharDriverState *vc_init(ChardevVC *vc);
#endif #endif

2
qemu-char.c
View file

@ -4357,7 +4357,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
abort(); abort();
break; break;
case CHARDEV_BACKEND_KIND_VC: case CHARDEV_BACKEND_KIND_VC:
chr = vc_init(backend->vc); abort();
break; break;
case CHARDEV_BACKEND_KIND_RINGBUF: case CHARDEV_BACKEND_KIND_RINGBUF:
case CHARDEV_BACKEND_KIND_MEMORY: case CHARDEV_BACKEND_KIND_MEMORY:

1
stubs/Makefile.objs
View file

@ -27,7 +27,6 @@ stub-obj-y += set-fd-handler.o
stub-obj-y += slirp.o stub-obj-y += slirp.o
stub-obj-y += sysbus.o stub-obj-y += sysbus.o
stub-obj-y += uuid.o stub-obj-y += uuid.o
stub-obj-y += vc-init.o
stub-obj-y += vm-stop.o stub-obj-y += vm-stop.o
stub-obj-y += vmstate.o stub-obj-y += vmstate.o
stub-obj-$(CONFIG_WIN32) += fd-register.o stub-obj-$(CONFIG_WIN32) += fd-register.o

7
stubs/vc-init.c
View file

@ -1,7 +0,0 @@
#include "qemu-common.h"
#include "sysemu/char.h"
CharDriverState *vc_init(ChardevVC *vc)
{
return 0;
}

10
ui/console.c
View file

@ -1962,7 +1962,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds)
chr->init(chr); chr->init(chr);
} }
static CharDriverState *text_console_init(ChardevVC *vc) static CharDriverState *text_console_init(ChardevVC *vc, Error **errp)
{ {
CharDriverState *chr; CharDriverState *chr;
QemuConsole *s; QemuConsole *s;
@ -1993,6 +1993,7 @@ static CharDriverState *text_console_init(ChardevVC *vc)
if (!s) { if (!s) {
g_free(chr); g_free(chr);
error_setg(errp, "cannot create text console");
return NULL; return NULL;
} }
@ -2012,9 +2013,10 @@ static CharDriverState *text_console_init(ChardevVC *vc)
static VcHandler *vc_handler = text_console_init; static VcHandler *vc_handler = text_console_init;
CharDriverState *vc_init(ChardevVC *vc) static CharDriverState *vc_init(const char *id, ChardevBackend *backend,
ChardevReturn *ret, Error **errp)
{ {
return vc_handler(vc); return vc_handler(backend->vc, errp);
} }
void register_vc_handler(VcHandler *handler) void register_vc_handler(VcHandler *handler)
@ -2094,7 +2096,7 @@ static void register_types(void)
{ {
type_register_static(&qemu_console_info); type_register_static(&qemu_console_info);
register_char_driver("vc", CHARDEV_BACKEND_KIND_VC, qemu_chr_parse_vc, register_char_driver("vc", CHARDEV_BACKEND_KIND_VC, qemu_chr_parse_vc,
NULL); vc_init);
} }
type_init(register_types); type_init(register_types);

2
ui/gtk.c
View file

@ -1591,7 +1591,7 @@ static int gd_vc_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
static int nb_vcs; static int nb_vcs;
static CharDriverState *vcs[MAX_VCS]; static CharDriverState *vcs[MAX_VCS];
static CharDriverState *gd_vc_handler(ChardevVC *unused) static CharDriverState *gd_vc_handler(ChardevVC *unused, Error **errp)
{ {
CharDriverState *chr; CharDriverState *chr;