diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 15:48:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 15:48:32 +0100 |
| commit | 895b810c1220fff7fb5cca5c428b881b6e30f0ac (patch) | |
| tree | 2a00789a37e93abe2cf8399555cab0e6b6771c71 /include | |
| parent | 19f377299518d4f68b2b9e983d90bd1382da0460 (diff) | |
| parent | ac20e1bb0e77cdf79c6e3f90ff910a46d8ca04c9 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141015-2' into staging
usb: add high speed mouse & keyboard configuration
* remotes/kraxel/tags/pull-usb-20141015-2:
xhci: remove dead code
usb-hid: Add high speed keyboard configuration
usb-hid: Add high speed mouse configuration
usb-hid: Move descriptor decision to usb-hid initfn
Conflicts:
include/hw/i386/pc.h
[Fixed trivial merge conflict in the pc-2.1 property list]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1c2602efd7..c4ee520e20 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -314,6 +314,14 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "secondary-vga",\ .property = "qemu-extended-regs",\ .value = "off",\ + },{\ + .driver = "usb-mouse",\ + .property = "usb_version",\ + .value = stringify(1),\ + },{\ + .driver = "usb-kbd",\ + .property = "usb_version",\ + .value = stringify(1),\ } #define PC_COMPAT_2_0 \ |