| Message ID | 20170303135150.12145-3-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri 03 Mar 2017 02:51:48 PM CET, Stefan Hajnoczi wrote: > +static uint64_t raw_max_size(QemuOpts *opts, BlockDriverState *in_bs, > + Error **errp) > +{ > + if (in_bs) { > + int64_t size = bdrv_nb_sectors(in_bs); > + if (size < 0) { > + error_setg_errno(errp, -size, "Unable to get image size"); > + return 0; > + } > + return (uint64_t)size * BDRV_SECTOR_SIZE; > + } Why not use bdrv_getlength() directly? It gives you the size in bytes. Berto
On Tue, Mar 07, 2017 at 11:32:29AM +0100, Alberto Garcia wrote: > On Fri 03 Mar 2017 02:51:48 PM CET, Stefan Hajnoczi wrote: > > > +static uint64_t raw_max_size(QemuOpts *opts, BlockDriverState *in_bs, > > + Error **errp) > > +{ > > + if (in_bs) { > > + int64_t size = bdrv_nb_sectors(in_bs); > > + if (size < 0) { > > + error_setg_errno(errp, -size, "Unable to get image size"); > > + return 0; > > + } > > + return (uint64_t)size * BDRV_SECTOR_SIZE; > > + } > > Why not use bdrv_getlength() directly? It gives you the size in bytes. Good idea. Will fix.
diff --git a/block/raw-format.c b/block/raw-format.c index 86fbc65..f8cb6b3 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -312,6 +312,21 @@ static int64_t raw_getlength(BlockDriverState *bs) return s->size; } +static uint64_t raw_max_size(QemuOpts *opts, BlockDriverState *in_bs, + Error **errp) +{ + if (in_bs) { + int64_t size = bdrv_nb_sectors(in_bs); + if (size < 0) { + error_setg_errno(errp, -size, "Unable to get image size"); + return 0; + } + return (uint64_t)size * BDRV_SECTOR_SIZE; + } + + return qemu_opt_get_size(opts, "size", 0); +} + static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { return bdrv_get_info(bs->file->bs, bdi); @@ -477,6 +492,7 @@ BlockDriver bdrv_raw = { .bdrv_truncate = &raw_truncate, .bdrv_getlength = &raw_getlength, .has_variable_length = true, + .bdrv_max_size = &raw_max_size, .bdrv_get_info = &raw_get_info, .bdrv_refresh_limits = &raw_refresh_limits, .bdrv_probe_blocksizes = &raw_probe_blocksizes,
Maximum size calculation is trivial for the raw format: it's just the requested image size (because there is no metadata). Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- block/raw-format.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)