diff options
| author | Heinz Graalfs <graalfs@linux.vnet.ibm.com> | 2014-10-24 13:10:49 +0000 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2014-11-05 16:35:56 +0100 |
| commit | bb3e9e1fd7ab62b60780c66d68b2d7bfd8758e61 (patch) | |
| tree | b92ea2f7aa163f1a5f5028a78b9085b75d756734 /hw | |
| parent | 87f2eff01623fe3d79e6c0962a3037d48b80b548 (diff) | |
| download | qemu-bb3e9e1fd7ab62b60780c66d68b2d7bfd8758e61.zip qemu-bb3e9e1fd7ab62b60780c66d68b2d7bfd8758e61.tar.gz qemu-bb3e9e1fd7ab62b60780c66d68b2d7bfd8758e61.tar.bz2 | |
s390x/sclpconsole: Avoid hanging SCLP ASCII console
Force recalculation of file descriptor sets for main loop's poll(),
in order to be able to readd a possibly removed input file descriptor
after can_read() returned 0 (zero).
Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/char/sclpconsole.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index fca105d..79891df 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -36,6 +36,7 @@ typedef struct SCLPConsole { uint32_t iov_bs; /* offset in buf for char layer read operation */ uint32_t iov_data_len; /* length of byte stream in buffer */ uint32_t iov_sclp_rest; /* length of byte stream not read via SCLP */ + bool notify; /* qemu_notify_event() req'd if true */ } SCLPConsole; /* character layer call-back functions */ @@ -44,8 +45,12 @@ typedef struct SCLPConsole { static int chr_can_read(void *opaque) { SCLPConsole *scon = opaque; + int avail = SIZE_BUFFER_VT220 - scon->iov_data_len; - return SIZE_BUFFER_VT220 - scon->iov_data_len; + if (avail == 0) { + scon->notify = true; + } + return avail; } /* Send data from a char device over to the guest */ @@ -113,6 +118,10 @@ static void get_console_data(SCLPEvent *event, uint8_t *buf, size_t *size, cons->iov_sclp += avail; /* more data pending */ } + if (cons->notify) { + cons->notify = false; + qemu_notify_event(); + } } static int read_event_data(SCLPEvent *event, EventBufferHeader *evt_buf_hdr, @@ -229,6 +238,7 @@ static void console_reset(DeviceState *dev) scon->iov_bs = 0; scon->iov_data_len = 0; scon->iov_sclp_rest = 0; + scon->notify = false; } static int console_exit(SCLPEvent *event) |