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>, "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, "Hervé Poussineau" <hpoussin@reactos.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Magnus Damm <magnus.damm@gmail.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
include/hw/boards.h | 1 +
include/hw/char/parallel.h | 2 ++
include/hw/i386/pc.h | 1 -
hw/char/parallel-isa.c | 2 +-
hw/char/parallel.c | 1 -
hw/i386/pc.c | 3 ++-
hw/i386/pc_piix.c | 7 ++++--
hw/i386/pc_q35.c | 8 +++---
hw/isa/isa-superio.c | 3 ++-
hw/ppc/e500.c | 3 ++-
hw/ppc/e500plat.c | 1 +
hw/ppc/mac_newworld.c | 4 ++-
hw/ppc/mac_oldworld.c | 4 ++-
hw/ppc/mpc8544ds.c | 1 +
hw/ppc/ppc440_bamboo.c | 4 ++-
hw/ppc/prep.c | 4 ++-
hw/s390x/s390-virtio-ccw.c | 4 ++-
hw/sh4/r2d.c | 4 ++-
hw/sparc64/sun4u.c | 11 ++++++---
softmmu/vl.c | 20 ++++++++++++++-
tests/qtest/cdrom-test.c | 18 +++++++++++---
tests/qtest/device-plug-test.c | 9 ++++++-
tests/qtest/readconfig-test.c | 5 +++-
tests/qtest/usb-hcd-uhci-test.c | 5 ++++
tests/qtest/virtio-ccw-test.c | 43 ++++++++++-----------------------
.gitlab-ci.d/buildtest.yml | 2 +-
hw/i386/Kconfig | 2 +-
tests/qemu-iotests/172 | 2 +-
tests/qtest/meson.build | 10 +++-----
29 files changed, 118 insertions(+), 66 deletions(-)