Merge remote-tracking branch 'kraxel/usb.19' into staging

diff --combined hw/pci_ids.h
index b49c602844930e5fcbba22bb7ed6cef136dc1c7e,927f2b06277d1cc08cf7c3d2618d3bf529b27a72..83f38934ec97b4a41e9d125ae7adfa4d99b220ef
--- 1/hw/pci_ids.h
--- 2/hw/pci_ids.h
+++ b/hw/pci_ids.h
@@@ -109,6 -109,13 +109,14 @@@
  #define PCI_DEVICE_ID_INTEL_82371AB      0x7111
  #define PCI_DEVICE_ID_INTEL_82371AB_2    0x7112
  #define PCI_DEVICE_ID_INTEL_82371AB_3    0x7113
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI1 0x2934
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI2 0x2935
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI3 0x2936
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI4 0x2937
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI5 0x2938
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI6 0x2939
+ #define PCI_DEVICE_ID_INTEL_82801I_EHCI1 0x293a
+ #define PCI_DEVICE_ID_INTEL_82801I_EHCI2 0x293c
  
 -#define PCI_VENDOR_ID_XENSOURCE          0x5853
 +#define PCI_VENDOR_ID_XEN               0x5853
 +#define PCI_DEVICE_ID_XEN_PLATFORM      0x0001