On 18/10/2016 12:52, David Gibson wrote:
> This series contains a number of cleanups to the libqos code for
> accessing PCI devices, and to tests which use it.
> 
> The general aim is to improve the consistency of semantics across
> functions, and reduce the amount of intimate knowledge of the libqos
> PCI layer needed by tests.
> 
> This should make it easier to write PCI tests which will be portable
> to different guest machines with different PCI host bridge
> arrangements.
> 
> David Gibson (8):
>   libqos: Give qvirtio_config_read*() consistent semantics
>   libqos: Handle PCI IO de-multiplexing in common code
>   libqos: Move BAR assignment to common code
>   tests: Better handle legacy IO addresses in tco-test
>   libqos: Add streaming accessors for PCI MMIO
>   libqos: Implement mmio accessors in terms of mem{read,write}
>   tests: Use qpci_mem{read,write} in ivshmem-test
>   libqos: Change PCI accessors to take opaque BAR handle
> 
>  tests/ahci-test.c          |   4 +-
>  tests/e1000e-test.c        |   7 +-
>  tests/ide-test.c           |  23 +++---
>  tests/ivshmem-test.c       |  28 ++++----
>  tests/libqos/ahci.c        |   3 +-
>  tests/libqos/ahci.h        |   6 +-
>  tests/libqos/pci-pc.c      | 170 +++++++++-----------------------------------
>  tests/libqos/pci-spapr.c   | 172 
> ++++++++++-----------------------------------
>  tests/libqos/pci.c         | 168 ++++++++++++++++++++++++++++++++++---------
>  tests/libqos/pci.h         |  60 ++++++++++------
>  tests/libqos/usb.c         |   6 +-
>  tests/libqos/usb.h         |   2 +-
>  tests/libqos/virtio-mmio.c |  16 ++---
>  tests/libqos/virtio-pci.c  | 117 ++++++++++++++++--------------
>  tests/libqos/virtio-pci.h  |   2 +-
>  tests/rtl8139-test.c       |  10 ++-
>  tests/tco-test.c           |  87 +++++++++++------------
>  tests/usb-hcd-ehci-test.c  |   5 +-
>  tests/virtio-9p-test.c     |   9 +--
>  tests/virtio-blk-test.c    |  51 +++-----------
>  tests/virtio-scsi-test.c   |   5 +-
>  21 files changed, 418 insertions(+), 533 deletions(-)
> 

This series conflicts with series "tests: enable virtio tests on SPAPR".

Which one will you apply first?

Thanks,
Laurent

Reply via email to