mirror of https://github.com/proxmox/mirror_qemu
terminal3270: do not use backend timer sources
terminal3270 uses the front-end side of the chardev. It shouldn't
create sources from backend side context (with backend
functions).
send_timing_mark_cb calls qemu_chr_fe_write_all() which should be
thread safe.
This partially reverts changes from commit
2c716ba150
.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190206174328.9736-4-marcandre.lureau@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
master
parent
3d9e232240
commit
b1f1103dba
|
@ -31,7 +31,7 @@ typedef struct Terminal3270 {
|
|||
uint8_t outv[OUTPUT_BUFFER_SIZE];
|
||||
int in_len;
|
||||
bool handshake_done;
|
||||
GSource *timer_src;
|
||||
guint timer_tag;
|
||||
} Terminal3270;
|
||||
|
||||
#define TYPE_TERMINAL_3270 "x-terminal3270"
|
||||
|
@ -47,10 +47,9 @@ static int terminal_can_read(void *opaque)
|
|||
|
||||
static void terminal_timer_cancel(Terminal3270 *t)
|
||||
{
|
||||
if (t->timer_src) {
|
||||
g_source_destroy(t->timer_src);
|
||||
g_source_unref(t->timer_src);
|
||||
t->timer_src = NULL;
|
||||
if (t->timer_tag) {
|
||||
g_source_remove(t->timer_tag);
|
||||
t->timer_tag = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -100,8 +99,7 @@ static void terminal_read(void *opaque, const uint8_t *buf, int size)
|
|||
assert(size <= (INPUT_BUFFER_SIZE - t->in_len));
|
||||
|
||||
terminal_timer_cancel(t);
|
||||
t->timer_src = qemu_chr_timeout_add_ms(t->chr.chr, 600 * 1000,
|
||||
send_timing_mark_cb, t);
|
||||
t->timer_tag = g_timeout_add_seconds(600, send_timing_mark_cb, t);
|
||||
memcpy(&t->inv[t->in_len], buf, size);
|
||||
t->in_len += size;
|
||||
if (t->in_len < 2) {
|
||||
|
@ -160,8 +158,7 @@ static void chr_event(void *opaque, int event)
|
|||
* char-socket.c. Once qemu receives the terminal-type of the
|
||||
* client, mark handshake done and trigger everything rolling again.
|
||||
*/
|
||||
t->timer_src = qemu_chr_timeout_add_ms(t->chr.chr, 600 * 1000,
|
||||
send_timing_mark_cb, t);
|
||||
t->timer_tag = g_timeout_add_seconds(600, send_timing_mark_cb, t);
|
||||
break;
|
||||
case CHR_EVENT_CLOSED:
|
||||
sch->curr_status.scsw.dstat = SCSW_DSTAT_DEVICE_END;
|
||||
|
|
Loading…
Reference in New Issue