]> git.proxmox.com Git - mirror_qemu.git/commit - include/hw/i386/pc.h
xhci PCIe endpoint migration compatibility fix
authorDr. David Alan Gilbert <dgilbert@redhat.com>
Tue, 9 Sep 2014 10:19:43 +0000 (11:19 +0100)
committerGerd Hoffmann <kraxel@redhat.com>
Wed, 10 Sep 2014 05:20:53 +0000 (07:20 +0200)
commite6043e92c2812a56b8f6cf35d5512067c746ce21
tree0d5bfce0364b24db2535198502b2cbc3cfaf884b
parentf102f224556f292f55b6e25147741bb8c48c9451
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: qemu-stable@nongnu.org
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
hw/usb/hcd-xhci.c
include/hw/i386/pc.h