Le mer. 27 mars 2019 18:18, John Snow <js...@redhat.com> a écrit : > > > On 3/27/19 5:56 AM, Stefano Garzarella wrote: > > IEC binary prefixes are already defined in "qemu/units.h", > > so we can remove redundant definitions in "block/vhdx.h". > > > > Signed-off-by: Stefano Garzarella <sgarz...@redhat.com> > > --- > > block/vhdx.c | 3 ++- > > block/vhdx.h | 6 +----- > > 2 files changed, 3 insertions(+), 6 deletions(-) > > > > diff --git a/block/vhdx.c b/block/vhdx.c > > index b785aef4b7..7cd1fc3731 100644 > > --- a/block/vhdx.c > > +++ b/block/vhdx.c > > @@ -1889,7 +1889,8 @@ static int coroutine_fn > vhdx_co_create(BlockdevCreateOptions *opts, > > return -EINVAL; > > } > > if (block_size > VHDX_BLOCK_SIZE_MAX) { > > - error_setg(errp, "Block size must not exceed %d", > VHDX_BLOCK_SIZE_MAX); > > + error_setg(errp, "Block size must not exceed %" PRId64, > > + VHDX_BLOCK_SIZE_MAX); > > return -EINVAL; > > } > > > > diff --git a/block/vhdx.h b/block/vhdx.h > > index 1bfb4e4f73..bf72090c8f 100644 > > --- a/block/vhdx.h > > +++ b/block/vhdx.h > > @@ -17,11 +17,7 @@ > > > > #ifndef BLOCK_VHDX_H > > #define BLOCK_VHDX_H > > - > > -#define KiB (1 * 1024) > > -#define MiB (KiB * 1024) > > -#define GiB (MiB * 1024) > > -#define TiB ((uint64_t) GiB * 1024) > > +#include "qemu/units.h" > > > > #define DEFAULT_LOG_SIZE 1048576 /* 1MiB */ > > /* Structures and fields present in the VHDX file */ > > > > Looks good. By the way, you may want to consider adding to your git > config rules that put the .h file diff changes above the .c file. > > Look at qemu/scripts/git.orderfile > > (I know I'm one to talk, I still haven't set mine up...) >
=) > Reviewed-by: John Snow <js...@redhat.com> > >