[Qemu-commits] [qemu/qemu] e6043e: xhci PCIe endpoint migration compatibility fix

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e6043e92c2812a56b8f6cf35d5512067c746ce21
      
https://github.com/qemu/qemu/commit/e6043e92c2812a56b8f6cf35d5512067c746ce21
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-09-10 (Wed, 10 Sep 2014)

  Changed paths:
    M hw/usb/hcd-xhci.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  xhci PCIe endpoint migration compatibility fix

Add back the PCIe config capabilities on XHCI cards in non-PCIe slots,
but only for machine types before 2.1.

This fixes a migration incompatibility in the XHCI PCI devices
caused by:
   058fdcf52cdbf57b67e7 - xhci: add endpoint cap on express bus only

Note that in fixing it for compatibility with older QEMUs, it breaks
compatibility with existing QEMU 2.1's on older machine types.

The status before this patch was (if it used an XHCI adapter):
   machine type | source qemu
     any           pre-2.1     - FAIL
     any           2.1...      - PASS

With this patch:
   machine type | source qemu
     any           pre-2.1    - PASS
     pre-2.1       2.1...     - FAIL
     2.1           2.1...     - PASS

A test to trigger it is to add '-device nec-usb-xhci,id=xhci,addr=0x12'
to the command line.

Cc: address@hidden
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: fc3b9aa876901ab2317923ce1ab09043eee7f2a4
      
https://github.com/qemu/qemu/commit/fc3b9aa876901ab2317923ce1ab09043eee7f2a4
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-11 (Thu, 11 Sep 2014)

  Changed paths:
    M hw/usb/hcd-xhci.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  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) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-usb-20140910-1:
  xhci PCIe endpoint migration compatibility fix

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/10601bef5664...fc3b9aa87690