De-confusify the 'replies' files for human usage by recording which
commands were used for gathering given block. Additionally this tests
that the commands emitted by libvirt are as recorded.

This series is in RFC state, since it creates some churn in the
capability files and also 'tests/qemucapsfixreplies' will no longer
work.

Patch 8 contains the changed files for ease of review and patch 9
contains the tool used to regenerate them from the current state.

Peter Krempa (9):
  qemu: monitor: Add possibility to reset command sequence in tests
  tests: qemumonitor: Simplify handling of end of file in full file test
  tests: qemumonitor: Optimize control flow when concatenating replies
  tests: qemucapsprobemock: Simplify and extract skipping of empty lines
  tests: qemucapsprobemock: Fail if JSON reply from qemu can't be
    reformatted
  tests: qemucapsprobemock: Prepare 'qemucapsprobe' for the new format
  tests: qemucapabilities: Test commands used to query capabilities
  FIXUP: Tweak capability files to conform to the new approach
  DO_NOT_APPLY: HACK: Regenerate qemucapabilitiestest data

 fix-files.sh                                       |    1 +
 src/qemu/qemu_monitor.c                            |   11 +
 src/qemu/qemu_monitor_priv.h                       |   31 +
 tests/Makefile.am                                  |    1 +
 .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies |  317 +++++-
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies |  317 +++++-
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies |  317 +++++-
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies |  317 +++++-
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |    2 +-
 .../caps_2.10.0.aarch64.replies                    |  319 +++++-
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml |    2 +-
 .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies |  322 +++++-
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_2.10.0.s390x.replies |  342 +++++-
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   |    2 +-
 .../caps_2.10.0.x86_64.replies                     | 1120 ++++++++++++++++++-
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  |    2 +-
 .../qemucapabilitiesdata/caps_2.11.0.s390x.replies |  350 +++++-
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   |    2 +-
 .../caps_2.12.0.aarch64.replies                    |  328 +++++-
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml |    2 +-
 .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies |  331 +++++-
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_2.12.0.s390x.replies |  358 +++++-
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |    2 +-
 .../caps_2.12.0.x86_64.replies                     | 1173 +++++++++++++++++++-
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |    2 +-
 .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies |  341 +++++-
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies |  346 +++++-
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   |    2 +-
 .../caps_2.6.0.aarch64.replies                     |  319 +++++-
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml  |    2 +-
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies  |  322 +++++-
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml    |    2 +-
 .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies |  346 +++++-
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_2.7.0.s390x.replies  |  306 ++++-
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml    |    2 +-
 .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies |  346 +++++-
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_2.8.0.s390x.replies  |  342 +++++-
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml    |    2 +-
 .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies |  346 +++++-
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   |    2 +-
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies  |  322 +++++-
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml    |    2 +-
 .../qemucapabilitiesdata/caps_2.9.0.s390x.replies  |  342 +++++-
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml    |    2 +-
 .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 1120 ++++++++++++++++++-
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   |    2 +-
 tests/qemucapabilitiestest.c                       |   17 +-
 tests/qemucapsprobemock.c                          |   77 +-
 tests/qemumonitortestutils.c                       |   52 +-
 57 files changed, 10564 insertions(+), 385 deletions(-)
 create mode 100755 fix-files.sh
 create mode 100644 src/qemu/qemu_monitor_priv.h

-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list