3905fdd0ba
Virtio-Console can only process one character at a time. Using it on S390 gave me strange "lags" where I got the character I pressed before when pressing one. So I typed in "abc" and only received "a", then pressed "d" but the guest received "b" and so on. While the stdio driver calls a poll function that just processes on its queue in case virtio-console can't take multiple characters at once, the muxer does not have such callbacks, so it can't empty its queue. To work around that limitation, I introduced a new timer that only gets active when the guest can not receive any more characters. In that case it polls again after a while to check if the guest is now receiving input. This patch fixes input when using -nographic on s390 for me. [AF: Rebased for v2.7.0-rc2] [BR: minor edits to pass qemu's checkpatch script] Signed-off-by: Bruce Rogers <brogers@suse.com>
72 lines
2.4 KiB
C
72 lines
2.4 KiB
C
/*
|
|
* QEMU Character device internals
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef CHARDEV_INTERNAL_H
|
|
#define CHARDEV_INTERNAL_H
|
|
|
|
#include "chardev/char.h"
|
|
#include "chardev/char-fe.h"
|
|
#include "qom/object.h"
|
|
|
|
#define MAX_MUX 4
|
|
#define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */
|
|
#define MUX_BUFFER_MASK (MUX_BUFFER_SIZE - 1)
|
|
|
|
struct MuxChardev {
|
|
Chardev parent;
|
|
CharBackend *backends[MAX_MUX];
|
|
CharBackend chr;
|
|
#if defined(TARGET_S390X)
|
|
QEMUTimer *accept_timer;
|
|
#endif
|
|
int focus;
|
|
int mux_cnt;
|
|
int term_got_escape;
|
|
int max_size;
|
|
/* Intermediate input buffer catches escape sequences even if the
|
|
currently active device is not accepting any input - but only until it
|
|
is full as well. */
|
|
unsigned char buffer[MAX_MUX][MUX_BUFFER_SIZE];
|
|
int prod[MAX_MUX];
|
|
int cons[MAX_MUX];
|
|
int timestamps;
|
|
|
|
/* Protected by the Chardev chr_write_lock. */
|
|
int linestart;
|
|
int64_t timestamps_start;
|
|
};
|
|
typedef struct MuxChardev MuxChardev;
|
|
|
|
DECLARE_INSTANCE_CHECKER(MuxChardev, MUX_CHARDEV,
|
|
TYPE_CHARDEV_MUX)
|
|
#define CHARDEV_IS_MUX(chr) \
|
|
object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX)
|
|
|
|
void mux_set_focus(Chardev *chr, int focus);
|
|
void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event);
|
|
|
|
Object *get_chardevs_root(void);
|
|
|
|
#endif /* CHARDEV_INTERNAL_H */
|