From 5ff5efb46c4526f111e14c2247609f1c56f0f8f3 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Tue, 12 Aug 2014 10:12:54 +0800 Subject: block: Pass errp in blkconf_geometry This allows us to pass error information to caller. Reviewed-by: Andreas Färber Reviewed-by: Stefan Hajnoczi Signed-off-by: Fam Zheng Signed-off-by: Paolo Bonzini --- include/hw/block/block.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 7c3d6c8178..3a0148848b 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -12,6 +12,7 @@ #define HW_BLOCK_COMMON_H #include "qemu-common.h" +#include "qapi/error.h" /* Configuration */ @@ -60,8 +61,9 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) /* Configuration helpers */ void blkconf_serial(BlockConf *conf, char **serial); -int blkconf_geometry(BlockConf *conf, int *trans, - unsigned cyls_max, unsigned heads_max, unsigned secs_max); +void blkconf_geometry(BlockConf *conf, int *trans, + unsigned cyls_max, unsigned heads_max, unsigned secs_max, + Error **errp); /* Hard disk geometry */ -- cgit v1.2.3-55-g7522