Added three more patches to the patchset I sent before Christmas and rebased to current master.
This first round of s390x patches includes: - new compat machine - remove the old s390-virtio machine (would like an ack from Alex on this) - fixes and some cleanup Cornelia Huck (2): s390x: add 2.6 compat machine s390x/virtio: use qemu_check_nic_model() Halil Pasic (1): virtio-ccw: fix sanity check for vector Pierre Morel (2): s390x: remove s390-virtio machine s390x: remove s390-virtio devices Shmulik Ladkani (1): s390: Introduce CCW_COMPAT_2_5 Yi Min Zhao (3): s390x/pci: reject some operations to disabled PCI function s390x/pci: code cleanup s390x/pci: return real state during listing PCI hw/s390x/Makefile.objs | 2 +- hw/s390x/s390-pci-bus.c | 6 +- hw/s390x/s390-pci-bus.h | 1 + hw/s390x/s390-pci-inst.c | 20 +- hw/s390x/s390-virtio-bus.c | 758 --------------------------------------------- hw/s390x/s390-virtio-bus.h | 186 ----------- hw/s390x/s390-virtio-ccw.c | 27 +- hw/s390x/s390-virtio.c | 168 +--------- hw/s390x/virtio-ccw.c | 3 +- target-s390x/cpu.h | 3 - target-s390x/helper.c | 2 +- vl.c | 7 +- 12 files changed, 47 insertions(+), 1136 deletions(-) delete mode 100644 hw/s390x/s390-virtio-bus.c delete mode 100644 hw/s390x/s390-virtio-bus.h -- 2.6.4