Failed in applying to current master (
apply log)
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Jared Rossi <jrossi@linux.ibm.com>, Zhuoying Cai <zycai@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
hw/virtio/virtio-net-pci.c | 1 +
pc-bios/s390-ccw/main.c | 1 +
pc-bios/s390-ccw/netmain.c | 64 +---------------------
pc-bios/s390-ccw/virtio-ccw.c | 62 +++++++++++++++++++++
pc-bios/s390-ccw/virtio-ccw.h | 1 +
pc-bios/s390-ccw/virtio-net.c | 69 +++++++++++++++++++-----
pc-bios/s390-ccw/virtio-pci.c | 43 +++++++++++++++
pc-bios/s390-ccw/virtio-pci.h | 2 +
pc-bios/s390-ccw/virtio.c | 27 +++++++---
pc-bios/s390-ccw/virtio.h | 5 ++
tests/functional/s390x/test_pxelinux.py | 71 ++++++++++++++++++++-----
tests/qtest/meson.build | 1 +
tests/qtest/pxe-test.c | 1 +
13 files changed, 254 insertions(+), 94 deletions(-)