On 02/11/2014 11:33 PM, Chunyan Liu wrote: > qcow2.c: replace QEMUOptionParameter with QemuOpts in 'qemu-img amend' > > Signed-off-by: Dong Xu Wang > Signed-off-by: Chunyan Liu > --- > block.c | 4 +- > block/qcow2.c | 90 ++++++++++++++++++++------------------------ > include/block/block.h | 2 +- > include/block/block_int.h | 2 +- > qemu-img.c | 17 ++++---- > 5 files changed, 53 insertions(+), 62 deletions(-) > > @@ -2228,7 +2220,7 @@ static BlockDriver bdrv_qcow2 = { > .bdrv_open = qcow2_open, > .bdrv_close = qcow2_close, > .bdrv_reopen_prepare = qcow2_reopen_prepare, > - .bdrv_create2 = qcow2_create, > + .bdrv_create2 = qcow2_create, > .bdrv_has_zero_init = bdrv_has_zero_init_1, > .bdrv_co_get_block_status = qcow2_co_get_block_status, Might be worth aligning the = while touching this. > +++ b/include/block/block_int.h > @@ -229,7 +229,7 @@ struct BlockDriver { > BdrvCheckMode fix); > > int (*bdrv_amend_options)(BlockDriverState *bs, > - QEMUOptionParameter *options); > + QemuOpts *opts); Indentation looks odd here; and with your change to shorter contents, you can just pull it into one line instead of wrapping and worrying about indentation in the first place. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org