mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
73cdf3f2c9
When using virtio-console on s390, the input doesn't work.
The root of the problem is rather simple. What happens is the following:
1) create character device for stdio
2) char device is done creating, sends OPENED event
3) virtio-console adds handlers
4) no event comes because the char device is open already
5) virtio-console doesn't accept input because it didn't
receive an OPENED event
To make that sure virtio-console gets notified that the character device
is open even when it's been open from the beginning, this patch introduces
a variable that keeps track of the opened state. If the device is open when
the event handlers get installed, we just notify the handler.
This fixes input with virtio-console on s390.
Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
110 lines
3.8 KiB
C
110 lines
3.8 KiB
C
#ifndef QEMU_CHAR_H
|
|
#define QEMU_CHAR_H
|
|
|
|
#include "qemu-common.h"
|
|
#include "qemu-queue.h"
|
|
#include "qemu-option.h"
|
|
#include "qemu-config.h"
|
|
#include "qobject.h"
|
|
|
|
/* character device */
|
|
|
|
#define CHR_EVENT_BREAK 0 /* serial break char */
|
|
#define CHR_EVENT_FOCUS 1 /* focus to this terminal (modal input needed) */
|
|
#define CHR_EVENT_OPENED 2 /* new connection established */
|
|
#define CHR_EVENT_MUX_IN 3 /* mux-focus was set to this terminal */
|
|
#define CHR_EVENT_MUX_OUT 4 /* mux-focus will move on */
|
|
#define CHR_EVENT_CLOSED 5 /* connection closed */
|
|
|
|
|
|
#define CHR_IOCTL_SERIAL_SET_PARAMS 1
|
|
typedef struct {
|
|
int speed;
|
|
int parity;
|
|
int data_bits;
|
|
int stop_bits;
|
|
} QEMUSerialSetParams;
|
|
|
|
#define CHR_IOCTL_SERIAL_SET_BREAK 2
|
|
|
|
#define CHR_IOCTL_PP_READ_DATA 3
|
|
#define CHR_IOCTL_PP_WRITE_DATA 4
|
|
#define CHR_IOCTL_PP_READ_CONTROL 5
|
|
#define CHR_IOCTL_PP_WRITE_CONTROL 6
|
|
#define CHR_IOCTL_PP_READ_STATUS 7
|
|
#define CHR_IOCTL_PP_EPP_READ_ADDR 8
|
|
#define CHR_IOCTL_PP_EPP_READ 9
|
|
#define CHR_IOCTL_PP_EPP_WRITE_ADDR 10
|
|
#define CHR_IOCTL_PP_EPP_WRITE 11
|
|
#define CHR_IOCTL_PP_DATA_DIR 12
|
|
|
|
#define CHR_IOCTL_SERIAL_SET_TIOCM 13
|
|
#define CHR_IOCTL_SERIAL_GET_TIOCM 14
|
|
|
|
#define CHR_TIOCM_CTS 0x020
|
|
#define CHR_TIOCM_CAR 0x040
|
|
#define CHR_TIOCM_DSR 0x100
|
|
#define CHR_TIOCM_RI 0x080
|
|
#define CHR_TIOCM_DTR 0x002
|
|
#define CHR_TIOCM_RTS 0x004
|
|
|
|
typedef void IOEventHandler(void *opaque, int event);
|
|
|
|
struct CharDriverState {
|
|
void (*init)(struct CharDriverState *s);
|
|
int (*chr_write)(struct CharDriverState *s, const uint8_t *buf, int len);
|
|
void (*chr_update_read_handler)(struct CharDriverState *s);
|
|
int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg);
|
|
int (*get_msgfd)(struct CharDriverState *s);
|
|
IOEventHandler *chr_event;
|
|
IOCanReadHandler *chr_can_read;
|
|
IOReadHandler *chr_read;
|
|
void *handler_opaque;
|
|
void (*chr_send_event)(struct CharDriverState *chr, int event);
|
|
void (*chr_close)(struct CharDriverState *chr);
|
|
void (*chr_accept_input)(struct CharDriverState *chr);
|
|
void *opaque;
|
|
QEMUBH *bh;
|
|
char *label;
|
|
char *filename;
|
|
int opened;
|
|
QTAILQ_ENTRY(CharDriverState) next;
|
|
};
|
|
|
|
QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename);
|
|
CharDriverState *qemu_chr_open_opts(QemuOpts *opts,
|
|
void (*init)(struct CharDriverState *s));
|
|
CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*init)(struct CharDriverState *s));
|
|
void qemu_chr_close(CharDriverState *chr);
|
|
void qemu_chr_printf(CharDriverState *s, const char *fmt, ...);
|
|
int qemu_chr_write(CharDriverState *s, const uint8_t *buf, int len);
|
|
void qemu_chr_send_event(CharDriverState *s, int event);
|
|
void qemu_chr_add_handlers(CharDriverState *s,
|
|
IOCanReadHandler *fd_can_read,
|
|
IOReadHandler *fd_read,
|
|
IOEventHandler *fd_event,
|
|
void *opaque);
|
|
int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg);
|
|
void qemu_chr_generic_open(CharDriverState *s);
|
|
int qemu_chr_can_read(CharDriverState *s);
|
|
void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len);
|
|
int qemu_chr_get_msgfd(CharDriverState *s);
|
|
void qemu_chr_accept_input(CharDriverState *s);
|
|
void qemu_chr_info_print(Monitor *mon, const QObject *ret_data);
|
|
void qemu_chr_info(Monitor *mon, QObject **ret_data);
|
|
CharDriverState *qemu_chr_find(const char *name);
|
|
|
|
extern int term_escape_char;
|
|
|
|
/* async I/O support */
|
|
|
|
int qemu_set_fd_handler2(int fd,
|
|
IOCanReadHandler *fd_read_poll,
|
|
IOHandler *fd_read,
|
|
IOHandler *fd_write,
|
|
void *opaque);
|
|
int qemu_set_fd_handler(int fd,
|
|
IOHandler *fd_read,
|
|
IOHandler *fd_write,
|
|
void *opaque);
|
|
#endif
|