Thanks! I applied 1-12. One of the cleanups breaks cross-version migration, so I decided to defer them all. Once 1st part is merged, please rebase and repost.
On Fri, Jun 10, 2016 at 05:54:21PM +0800, Cao jin wrote: > v8 changelog: > 1. address all stylistic remarks (Markus) > 2. add two new patches(16&17) which I missed in last round, shoot the > unnecessary > internal msi flag. > 3. rebase on the upstream, fix trivial conflict in vmxnet3: > -#include "vmxnet_tx_pkt.h" > -#include "vmxnet_rx_pkt.h" > +#include "net_tx_pkt.h" > +#include "net_rx_pkt.h" > 4. There is a new device "e1000e" added, need to cover it in patch 12. > > Hi Markus, I add your R-b in first 15 patches, maybe you want to take a glance > at e1000e part in patch 12. > > The last two new patches need some review. > Will take care of msix flag cleanup when tackle msix_init(). > > cc: Gerd Hoffmann <[email protected]> > cc: John Snow <[email protected]> > cc: Dmitry Fleytman <[email protected]> > cc: Jason Wang <[email protected]> > cc: Michael S. Tsirkin <[email protected]> > cc: Hannes Reinecke <[email protected]> > cc: Paolo Bonzini <[email protected]> > cc: Alex Williamson <[email protected]> > cc: Markus Armbruster <[email protected]> > cc: Marcel Apfelbaum <[email protected]> > > Cao jin (17): > pci core: assert ENOSPC when add capability > fix some coding style problems > change pvscsi_init_msi() type to void > megasas: Fix check for msi_init() failure > 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 > msi_init: change return value to 0 on success > 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 > vmw_pvscsi: remove unnecessary internal msi state flag > vmxnet3: remove unnecessary internal msi state flag > e1000e: remove unnecessary internal msi state flag > > hw/audio/intel-hda.c | 29 +++++++++++++++---- > hw/ide/ich.c | 15 ++++++---- > hw/net/e1000e.c | 37 +++++------------------- > hw/net/vmxnet3.c | 52 +++++++++++---------------------- > hw/pci-bridge/ioh3420.c | 13 +++++++-- > hw/pci-bridge/pci_bridge_dev.c | 35 ++++++++++++++++------ > hw/pci-bridge/xio3130_downstream.c | 12 ++++++-- > hw/pci-bridge/xio3130_upstream.c | 9 +++++- > hw/pci/msi.c | 27 +++++++++++++++-- > hw/pci/pci.c | 6 ++-- > hw/scsi/megasas.c | 59 > ++++++++++++++++++++------------------ > hw/scsi/mptsas.c | 40 +++++++++++++++++--------- > hw/scsi/mptsas.h | 5 ++-- > hw/scsi/vmw_pvscsi.c | 18 +++--------- > hw/usb/hcd-xhci.c | 35 ++++++++++++++++------ > hw/vfio/pci.c | 7 +++-- > include/hw/pci/msi.h | 3 +- > 17 files changed, 233 insertions(+), 169 deletions(-) > > -- > 2.1.0 > >
