Failed in applying to current master (
apply log)
include/hw/boards.h | 2 +-
hw/arm/cubieboard.c | 1 +
hw/arm/integratorcp.c | 1 +
hw/arm/mcimx7d-sabre.c | 2 ++
hw/arm/npcm7xx_boards.c | 5 +++++
hw/arm/omap_sx1.c | 2 ++
hw/arm/orangepi.c | 1 +
hw/arm/realview.c | 4 ++++
hw/arm/stellaris.c | 1 +
hw/arm/vexpress.c | 2 ++
hw/arm/xilinx_zynq.c | 1 -
hw/core/null-machine.c | 1 -
hw/riscv/microchip_pfsoc.c | 1 +
hw/riscv/sifive_u.c | 1 +
hw/s390x/s390-virtio-ccw.c | 1 -
system/vl.c | 16 ++++++++++++----
16 files changed, 34 insertions(+), 8 deletions(-)