From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 22 Oct 2014 14:48:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141015-2' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=895b810c1220fff7fb5cca5c428b881b6e30f0ac;p=qemu.git

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>
---

895b810c1220fff7fb5cca5c428b881b6e30f0ac
diff --cc include/hw/i386/pc.h
index 1c2602efd7,db21a6197e..c4ee520e20
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@@ -306,14 -306,14 +306,22 @@@ bool e820_get_entry(int, uint32_t, uint
              .driver   = "intel-hda",\
              .property = "old_msi_addr",\
              .value    = "on",\
 +        },{\
 +            .driver   = "VGA",\
 +            .property = "qemu-extended-regs",\
 +            .value    = "off",\
 +        },{\
 +            .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 \