aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffrey McRae <geoff@hostfission.com>2018-05-07 23:01:46 +1000
committerGerd Hoffmann <kraxel@redhat.com>2018-05-15 11:22:33 +0200
commit143c04c7e0639e53086519592ead15d2556bfbf2 (patch)
tree474fb067c0296d96a36b52c5dbd0eaec1b69d356
parentfbd3a489df9953e2a5d017c922f3c103b2426952 (diff)
downloadqemu-arm-143c04c7e0639e53086519592ead15d2556bfbf2.tar.gz
ps2: Clear the PS/2 queue and obey disable
This allows guest's to correctly reinitialize and identify the mouse should the guest decide to re-scan or reset during mouse input events. When the guest sends the "Identify" command, due to the PC's hardware architecutre it is impossible to reliably determine the response from the command amongst other streaming data, such as mouse or keyboard events. Standard practice is for the guest to disable the device and then issue the identify command, so this must be obeyed. Signed-off-by: Geoffrey McRae <geoff@hostfission.com> Message-Id: <20180507150303.7486B381924@moya.office.hostfission.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/input/ps2.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 06f5d2ac4a..4abc8cecdd 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -232,6 +232,11 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
uint16_t keycode = 0;
int mod;
+ /* do not process events while disabled to prevent stream corruption */
+ if (!s->scan_enabled) {
+ return;
+ }
+
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
assert(evt->type == INPUT_EVENT_KIND_KEY);
qcode = qemu_input_key_value_to_qcode(key->key);
@@ -673,6 +678,11 @@ static void ps2_mouse_sync(DeviceState *dev)
{
PS2MouseState *s = (PS2MouseState *)dev;
+ /* do not sync while disabled to prevent stream corruption */
+ if (!(s->mouse_status & MOUSE_STATUS_ENABLED)) {
+ return;
+ }
+
if (s->mouse_buttons) {
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
}
@@ -776,6 +786,7 @@ void ps2_write_mouse(void *opaque, int val)
s->mouse_resolution = 2;
s->mouse_status = 0;
s->mouse_type = 0;
+ ps2_reset_queue(&s->common);
ps2_queue(&s->common, AUX_ACK);
ps2_queue(&s->common, 0xaa);
ps2_queue(&s->common, s->mouse_type);