diff options
| author | Fam Zheng | 2014-08-12 04:12:54 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-08-26 13:20:44 +0200 |
| commit | 5ff5efb46c4526f111e14c2247609f1c56f0f8f3 (patch) | |
| tree | 9c3a6652abe1500ea0f79818241c6a806ad508d7 /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140819'... (diff) | |
| download | qemu-5ff5efb46c4526f111e14c2247609f1c56f0f8f3.tar.gz qemu-5ff5efb46c4526f111e14c2247609f1c56f0f8f3.tar.xz qemu-5ff5efb46c4526f111e14c2247609f1c56f0f8f3.zip | |
block: Pass errp in blkconf_geometry
This allows us to pass error information to caller.
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/block/block.h | 6 |
1 files changed, 4 insertions, 2 deletions
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 */ |