5a1ee6077b
machine_init_done is not the right flag to check when preconfig
is taken into account; for example "./qemu-system-x86_64 -serial
mon:stdio -preconfig" does not print the QEMU monitor header until after
exit_preconfig. Add back a custom bool for mux character devices. This
partially undoes commit c7278b4355 ("chardev: introduce chr_machine_done
hook", 2018-03-12), but it keeps the cleaner logic using a function
pointer in ChardevClass.
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
45 lines
1,001 B
Meson
45 lines
1,001 B
Meson
chardev_ss.add(files(
|
|
'char-fe.c',
|
|
'char-file.c',
|
|
'char-io.c',
|
|
'char-mux.c',
|
|
'char-null.c',
|
|
'char-pipe.c',
|
|
'char-ringbuf.c',
|
|
'char-serial.c',
|
|
'char-socket.c',
|
|
'char-stdio.c',
|
|
'char-udp.c',
|
|
'char.c',
|
|
))
|
|
chardev_ss.add(when: 'CONFIG_POSIX', if_true: files(
|
|
'char-fd.c',
|
|
'char-parallel.c',
|
|
'char-pty.c',
|
|
))
|
|
chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
|
|
'char-console.c',
|
|
'char-win-stdio.c',
|
|
'char-win.c',
|
|
))
|
|
|
|
chardev_ss = chardev_ss.apply(config_host, strict: false)
|
|
|
|
softmmu_ss.add(files('msmouse.c', 'wctablet.c', 'testdev.c'))
|
|
|
|
chardev_modules = {}
|
|
|
|
if config_host.has_key('CONFIG_BRLAPI')
|
|
module_ss = ss.source_set()
|
|
module_ss.add(when: [brlapi], if_true: [files('baum.c'), pixman])
|
|
chardev_modules += { 'baum': module_ss }
|
|
endif
|
|
|
|
if config_host.has_key('CONFIG_SPICE')
|
|
module_ss = ss.source_set()
|
|
module_ss.add(when: [spice], if_true: files('spice.c'))
|
|
chardev_modules += { 'spice': module_ss }
|
|
endif
|
|
|
|
modules += { 'chardev': chardev_modules }
|