diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-11 10:36:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-11 10:36:50 +0100 |
| commit | fc3b9aa876901ab2317923ce1ab09043eee7f2a4 (patch) | |
| tree | b18935b9a01126bbe07fe1b5e91cce888e65fff0 /include | |
| parent | 10601bef566461efbea81ee344ed3355ce71954a (diff) | |
| parent | e6043e92c2812a56b8f6cf35d5512067c746ce21 (diff) | |
| download | hqemu-fc3b9aa876901ab2317923ce1ab09043eee7f2a4.zip hqemu-fc3b9aa876901ab2317923ce1ab09043eee7f2a4.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140910-1' into staging
xhci PCIe endpoint migration compatibility fix
# gpg: Signature made Wed 10 Sep 2014 06:35:20 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-usb-20140910-1:
xhci PCIe endpoint migration compatibility fix
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a39cb42..77316d5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -330,6 +330,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .value = "off",\ },\ {\ + .driver = "nec-usb-xhci",\ + .property = "force-pcie-endcap",\ + .value = "on",\ + },\ + {\ .driver = "pci-serial",\ .property = "prog_if",\ .value = stringify(0),\ |
