Just some minor changes from the last one. If nobody complains, I'll queue to s390-next.
I'd be happy about some acks/r-bs for patches that don't have any yet, though. v3->v4: - add "9pfs: fix dependencies" - in "kvm: remove hard dependency on pci", do s/assert/g_assert/ and add return statements for builds with asserts off Cornelia Huck (10): 9pfs: fix dependencies kvm: remove hard dependency on pci s390x/pci: add stubs s390x: chsc nt2 events are pci-only s390x/pci: do not advertise pci on non-pci builds s390x/ccw: create s390 phb conditionally s390x/sclp: properly guard pci-specific functions s390x/pci: fence off instructions for non-pci s390x/kvm: msi route fixup for non-pci s390x: refine pci dependencies accel/kvm/kvm-all.c | 6 ++-- default-configs/s390x-softmmu.mak | 2 +- fsdev/Makefile.objs | 9 ++--- hw/9pfs/Makefile.objs | 2 +- hw/Makefile.objs | 2 +- hw/pci/pci-stub.c | 15 ++++++++ hw/pci/pci.c | 2 ++ hw/s390x/Makefile.objs | 3 +- hw/s390x/s390-pci-bus.c | 4 +-- hw/s390x/s390-pci-bus.h | 4 +-- hw/s390x/s390-pci-stub.c | 74 +++++++++++++++++++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 14 ++++---- hw/s390x/sclp.c | 19 +++++++--- include/hw/pci/pci.h | 2 ++ target/s390x/ioinst.c | 16 +++++++++ target/s390x/kvm.c | 64 +++++++++++++++++++++++++-------- 16 files changed, 197 insertions(+), 41 deletions(-) create mode 100644 hw/s390x/s390-pci-stub.c -- 2.13.5
