rebased against upstream, and passed make check. changelog: 1. vmw_pvscsi: for compatibility, leave the field msi_used alone. 2. since patch "msi_init: change return value to 0 on success" has been adopted first, the patch "megasas: Fix check for msi_init() failure" isn't necessary anymore, so drop it. 3. fix failure of make check. It is actually not a bug, test case "/ahci/hba_spec" always think the 1st capability pointed by Capabilities pointer should be MSI, and the patch changed the order of adding capability. Since we don`t pass a error object to msi_init() in ich9ahci and return on its error, also and PCIDeviceClass->exit function is enough to free all the resource even if .realize() returns on msi_init() failure, so, revert to the position where we added msi capability to make "make check" happy.
cc: Gerd Hoffmann <kra...@redhat.com> cc: John Snow <js...@redhat.com> cc: Dmitry Fleytman <dmi...@daynix.com> cc: Jason Wang <jasow...@redhat.com> cc: Michael S. Tsirkin <m...@redhat.com> cc: Hannes Reinecke <h...@suse.de> cc: Paolo Bonzini <pbonz...@redhat.com> cc: Alex Williamson <alex.william...@redhat.com> cc: Markus Armbruster <arm...@redhat.com> cc: Marcel Apfelbaum <mar...@redhat.com> Cao jin (13): change pvscsi_init_msi() type to void mptsas: change .realize function name usb xhci: change msi/msix property type intel-hda: change msi property type mptsas: change msi property type megasas: change msi/msix property type pci bridge dev: change msi property type pci: Convert msi_init() to Error and fix callers to check it megasas: remove unnecessary megasas_use_msi() mptsas: remove unnecessary internal msi state flag vmxnet3: remove unnecessary internal msi state flag e1000e: remove unnecessary internal msi state flag vmw_pvscsi: remove unnecessary internal msi state flag hw/audio/intel-hda.c | 29 +++++++++++++++---- hw/ide/ich.c | 7 +++-- hw/net/e1000e.c | 37 +++++------------------- hw/net/vmxnet3.c | 52 +++++++++++---------------------- hw/pci-bridge/ioh3420.c | 6 +++- hw/pci-bridge/pci_bridge_dev.c | 31 ++++++++++++++------ hw/pci-bridge/xio3130_downstream.c | 6 +++- hw/pci-bridge/xio3130_upstream.c | 6 +++- hw/pci/msi.c | 11 +++++-- hw/scsi/megasas.c | 59 ++++++++++++++++++++------------------ hw/scsi/mptsas.c | 40 +++++++++++++++++--------- hw/scsi/mptsas.h | 5 ++-- hw/scsi/vmw_pvscsi.c | 15 ++++------ hw/usb/hcd-xhci.c | 35 ++++++++++++++++------ hw/vfio/pci.c | 7 +++-- include/hw/pci/msi.h | 3 +- 16 files changed, 194 insertions(+), 155 deletions(-) -- 2.1.0
