diff options
| author | Peter Maydell | 2019-01-08 17:07:32 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-08 17:07:32 +0100 |
| commit | 147923b1a901a0370f83a0f4c58ec1baffef22f0 (patch) | |
| tree | 349c735bbae9c259a493c535e193dfab0332574c /hw/usb/hcd-ehci.h | |
| parent | qemu-thread: Don't block SEGV, ILL and FPE (diff) | |
| parent | usb: move ehci_create_ich9_with_companions to hw/i386 (diff) | |
| download | qemu-147923b1a901a0370f83a0f4c58ec1baffef22f0.tar.gz qemu-147923b1a901a0370f83a0f4c58ec1baffef22f0.tar.xz qemu-147923b1a901a0370f83a0f4c58ec1baffef22f0.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190108-pull-request' into staging
usb: generic sysbus ehci, bugfixes.
# gpg: Signature made Tue 08 Jan 2019 15:53:37 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20190108-pull-request:
usb: move ehci_create_ich9_with_companions to hw/i386
hw/usb: Add generic sys-bus EHCI controller
usb: dev-mtp: fix memory leak in error path
usb: drop unnecessary usb_device_post_load checks
hw/usb: fix mistaken de-initialization of CCID state
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/hcd-ehci.h')
| -rw-r--r-- | hw/usb/hcd-ehci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 0bc364b286..cd30b5d5e0 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -342,6 +342,7 @@ typedef struct EHCIPCIState { #define TYPE_SYS_BUS_EHCI "sysbus-ehci-usb" +#define TYPE_PLATFORM_EHCI "platform-ehci-usb" #define TYPE_EXYNOS4210_EHCI "exynos4210-ehci-usb" #define TYPE_TEGRA2_EHCI "tegra2-ehci-usb" #define TYPE_PPC4xx_EHCI "ppc4xx-ehci-usb" |