Failed in applying to current master (
apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>
include/hw/s390x/s390-virtio-ccw.h | 1 +
hw/s390x/css.c | 51 +++++++++++++-
hw/s390x/s390-pci-inst.c | 29 ++++++--
hw/s390x/s390-virtio-ccw.c | 138 ++++++++++++++++++++++---------------
tests/qtest/e1000e-test.c | 66 +++---------------
tests/qtest/libqos/e1000e.c | 17 ++---
tests/qtest/migration-test.c | 18 +----
.gitlab-ci.d/buildtest.yml | 1 +
8 files changed, 176 insertions(+), 145 deletions(-)