MAINTAINERS | 3 +-
pc-bios/s390-ccw/virtio.h | 2 +
crypto/pbkdf.c | 15 +++-
hw/s390x/s390-virtio-ccw.c | 15 ++--
pc-bios/s390-ccw/bootmap.c | 15 ++--
pc-bios/s390-ccw/netmain.c | 52 +++++++-----
pc-bios/s390-ccw/virtio-net.c | 5 ++
pc-bios/s390-ccw/virtio.c | 7 +-
pc-bios/s390-ccw.img | Bin 79608 -> 96000 bytes
tests/functional/meson.build | 2 +
.../test_x86_64_kvm_xen.py} | 89 ++++++++++++---------
11 files changed, 128 insertions(+), 77 deletions(-)
rename tests/{avocado/kvm_xen_guest.py => functional/test_x86_64_kvm_xen.py} (61%)
mode change 100644 => 100755