diff options
| author | Peter Maydell | 2021-05-26 16:27:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-05-26 16:27:20 +0200 |
| commit | 2ab2dad01f6dc3667c0d53d2b1ba46b511031207 (patch) | |
| tree | a09998e717fc03ad947da861d74f45255a49e816 /hw/core/machine.c | |
| parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-misc-upda... (diff) | |
| parent | hw/input/ps2: Use ps2_raise_irq() instead of open coding it (diff) | |
| download | qemu-2ab2dad01f6dc3667c0d53d2b1ba46b511031207.tar.gz qemu-2ab2dad01f6dc3667c0d53d2b1ba46b511031207.tar.xz qemu-2ab2dad01f6dc3667c0d53d2b1ba46b511031207.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/input-20210526-pull-request' into staging
input: a bunch of ps2 fixes.
# gpg: Signature made Wed 26 May 2021 15:06:12 BST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/input-20210526-pull-request:
hw/input/ps2: Use ps2_raise_irq() instead of open coding it
pckbd: clear outport_present in outer pre_load()
pckbd: remove duplicated keyboard and mouse defines
pckbd: correctly disable PS/2 communication
pckbd: add function kbd_pending()
pckbd: add controller response queue
pckbd: add state variable for interrupt source
pckbd: PS/2 keyboard throttle
pckbd: don't update OBF flags if KBD_STAT_OBF is set
pckbd: split out interrupt line changing code
ps2: don't deassert irq twice if queue is empty
ps2: don't raise an interrupt if queue is full
ps2: fix mouse stream corruption
hw/input: expand trace info reported for ps2 device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 1bf0e687b9..55b9bc7817 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -38,6 +38,7 @@ GlobalProperty hw_compat_6_0[] = { { "gpex-pcihost", "allow-unmapped-accesses", "false" }, + { "i8042", "extended-state", "false"}, }; const size_t hw_compat_6_0_len = G_N_ELEMENTS(hw_compat_6_0); |