On 1/11/19 1:14 PM, Markus Armbruster wrote: > We define 54 macros for the powers of two >= 1024. We use six, in six > macro definitions. Four of them could just as well use the common MiB > macro, so do that. The remaining two can't, because they get passed > to stringify. Replace the macro by the literal number there. > Slightly harder to read in one instance (1048576 vs. S_1MiB), so add a > comment there. The other instance is a wash: 65536 vs S_64KiB. 65536 > has been good enough for more than seven years there. > > This effectively reverts commit 540b8492618 and 1240ac558d3. > > Signed-off-by: Markus Armbruster > --- > block/qcow2.h | 10 +++--- > block/vdi.c | 3 +- > include/qemu/units.h | 73 -------------------------------------------- > 3 files changed, 7 insertions(+), 79 deletions(-) Renders part of my v3 series useless (since I effectively did the same reversions), but is indeed the simplest baseline that can possibly work. Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org