On 05/07/2014 12:27 AM, Eric Blake wrote: > On 05/06/2014 07:36 AM, Ján Tomko wrote: >> QEMU commit 5e2ac51 added a boolean '-msg timestamp=[on|off]' >> option, which can enable timestamps on errors: >> $ qemu-system-x86_64 -msg timestamp=on zghhdorf >> 2014-04-09T13:25:46.779484Z qemu-system-x86_64: -msg timestamp=on: could >> not open disk image zghhdorf: Could not open 'zghhdorf': No such file or >> directory >> >> Enable this timestamp if the QEMU binary supports it. >> >> Add a 'log_timestamp' option to qemu.conf for disabling this behavior. >> --- >> Rebased to latest master, this time with the test files added. >> >> previous posting of the patch: >> https://www.redhat.com/archives/libvir-list/2014-April/msg00422.html >> >> src/qemu/libvirtd_qemu.aug | 3 ++ >> src/qemu/qemu.conf | 8 ++++++ >> src/qemu/qemu_capabilities.c | 5 ++++ >> src/qemu/qemu_capabilities.h | 1 + >> src/qemu/qemu_command.c | 4 +++ >> src/qemu/qemu_conf.c | 4 +++ >> src/qemu/qemu_conf.h | 2 ++ >> src/qemu/test_libvirtd_qemu.aug.in | 1 + >> tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + >> tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + >> .../qemuxml2argv-minimal-msg-timestamp.args | 6 ++++ >> .../qemuxml2argv-minimal-msg-timestamp.xml | 32 ++++++++++++++++++++++ >> tests/qemuxml2argvtest.c | 1 + >> 13 files changed, 69 insertions(+) >> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args >> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.xml > > ACK with nit: > >> @@ -1146,6 +1147,9 @@ virQEMUCapsComputeCmdFlags(const char *help, >> if (strstr(help, "-machine")) >> virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); >> >> + if (strstr(help, "-msg timestamp")) >> + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MSG_TIMESTAMP); >> + > > This hunk is dead code. -msg timestamp was not added until qemu new > enough to support QMP probing, so we shouldn't be scraping -help output > for it. It can be re-added as a downstream-only patch to anyone (hello > RHEL) that backports the qemu feature without supporting QMP probing, as > needed, but no need to carry it upstream. > I have removed the hunk and pushed the patch. Jan
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list