On Thu, 2018-04-05 at 14:22 +0200, Ján Tomko wrote: > Remove the qmpOnly attribute of virQEMUCapsNewForBinaryInternal s/attribute/argument/ > and instead always assume it's true. > > This effectively sets the minimum QEMU version to 1.2.0, > breaking support for QEMU in RHEL6. I don't think we need to single out RHEL6 here, mentioning the QEMU version is enough. In other words, just drop the second line. > cfg.mk | 2 +- > src/qemu/qemu_capabilities.c | 866 +----------------------------- > src/qemu/qemu_capspriv.h | 17 +- > tests/Makefile.am | 8 +- > tests/qemucapsprobe.c | 2 +- > tests/qemuhelpdata/qemu-0.12.1 | 198 ------- > tests/qemuhelpdata/qemu-0.12.1-device | 62 --- > tests/qemuhelpdata/qemu-1.0 | 253 --------- > tests/qemuhelpdata/qemu-1.0-device | 148 ----- > tests/qemuhelpdata/qemu-1.1.0 | 269 ---------- > tests/qemuhelpdata/qemu-1.1.0-device | 170 ------ > tests/qemuhelpdata/qemu-1.2.0 | 272 ---------- > tests/qemuhelpdata/qemu-kvm-0.12.3 | 215 -------- > tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 --- > tests/qemuhelpdata/qemu-kvm-0.13.0 | 242 --------- > tests/qemuhelpdata/qemu-kvm-0.13.0-device | 90 ---- > tests/qemuhelpdata/qemu-kvm-1.2.0 | 277 ---------- > tests/qemuhelptest.c | 437 --------------- > 18 files changed, 8 insertions(+), 3583 deletions(-) Good riddance o/ > diff --git a/cfg.mk b/cfg.mk > index 4aa26d434a..980f34bb7d 100644 > --- a/cfg.mk > +++ b/cfg.mk > @@ -1225,7 +1225,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \ > ^(examples/|tools/virsh-edit\.c$$) > > exclude_file_name_regexp--sc_trailing_blank = \ > - /qemuhelpdata/|/sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib/local/.*/.*diff$$ > + /sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib/local/.*/.*diff$$ > > exclude_file_name_regexp--sc_unmarked_diagnostics = \ > ^(docs/apibuild.py|tests/virt-aa-helper-test|docs/js/.*\.js)$$ You missed exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ (^tests/(qemuhelp|virhostcpu|virpcitest)data/|docs/js/.*\.js|docs/fonts/.*\.woff|\.diff|tests/virconfdata/no-newline\.conf$$) With that taken care of and the commit message fixed, Reviewed-by: Andrea Bolognani <abologna@xxxxxxxxxx> -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list