[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 2/3] iotests: _filter_qmp for pretty JSON output
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 2/3] iotests: _filter_qmp for pretty JSON output |
Date: |
Mon, 17 Nov 2014 13:31:05 +0100 |
_filter_qmp should be able to correctly filter out the QMP version
object for pretty JSON output.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/common.filter | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 3acdb30..dfb9726 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -167,7 +167,9 @@ _filter_qmp()
{
_filter_win32 | \
sed -e 's#\("\(micro\)\?seconds": \)[0-9]\+#\1 TIMESTAMP#g' \
- -e 's#^{"QMP":.*}$#QMP_VERSION#'
+ -e 's#^{"QMP":.*}$#QMP_VERSION#' \
+ -e '/^ "QMP": {\s*$/, /^ }\s*$/ c\' \
+ -e ' QMP_VERSION'
}
# replace driver-specific options in the "Formatting..." line
--
1.9.3
Re: [Qemu-devel] [PATCH v4 0/3] chardev: Add -qmp-pretty, Kevin Wolf, 2014/11/20
Re: [Qemu-devel] [PATCH v4 0/3] chardev: Add -qmp-pretty, Markus Armbruster, 2014/11/28