include/qapi/qmp/qerror.h | 3 -- util/block-helpers.h | 3 +- block/export/vduse-blk.c | 7 +--- block/export/vhost-user-blk-server.c | 6 +-- hw/core/qdev-properties-system.c | 6 +-- hw/intc/openpic.c | 5 +-- qga/commands-bsd.c | 1 - qga/commands-linux.c | 1 - qga/commands-posix.c | 1 - target/i386/cpu.c | 59 +++++++++++++--------------- util/block-helpers.c | 28 ++++++------- 11 files changed, 46 insertions(+), 74 deletions(-)