Patch 1 is the same I sent earlier. Patches 2 and 3/4 fix the other two problems by Sheng (tip: next time use "make -k" and report all problems in a single message).
Paolo Bonzini (4): qemu-img: avoid preprocessor directives in a printf call cope with printf macro definition in readline.c do not interpolate % from vl.c to qemu-options.h vl.c: avoid preprocessor directives in a printf call qemu-img.c | 9 +++++---- qemu-options.hx | 15 ++++++++------- readline.c | 1 + vl.c | 23 +++++++++-------------- 4 files changed, 23 insertions(+), 25 deletions(-)