[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/25] libqtest: Simplify qmp_fd_vsend() a bit
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 08/25] libqtest: Simplify qmp_fd_vsend() a bit |
Date: |
Thu, 16 Aug 2018 10:36:44 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
tests/libqtest.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 2fe0f4dc29..9e3870bb7d 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -488,24 +488,20 @@ QDict *qtest_qmp_receive(QTestState *s)
*/
void qmp_fd_vsend(int fd, const char *fmt, va_list ap)
{
- va_list ap_copy;
QObject *qobj;
- /* qobject_from_jsonv() silently eats leading 0xff as invalid
- * JSON, but we want to test sending them over the wire to force
- * resyncs */
+ /*
+ * qobject_from_vjsonf_nofail() chokes on leading 0xff as invalid
+ * JSON, but tests/test-qga.c needs to send that to test QGA
+ * synchronization
+ */
if (*fmt == '\377') {
socket_send(fd, fmt, 1);
fmt++;
}
- /* Going through qobject ensures we escape strings properly.
- * This seemingly unnecessary copy is required in case va_list
- * is an array type.
- */
- va_copy(ap_copy, ap);
- qobj = qobject_from_jsonv(fmt, &ap_copy, &error_abort);
- va_end(ap_copy);
+ /* Going through qobject ensures we escape strings properly */
+ qobj = qobject_from_vjsonf_nofail(fmt, ap);
/* No need to send anything for an empty QObject. */
if (qobj) {
--
2.17.1
- [Qemu-devel] [PULL 00/25] Testing patches for 2018-08-16, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 01/25] libqtest: Rename functions to send QMP messages, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 08/25] libqtest: Simplify qmp_fd_vsend() a bit,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/25] libqtest: Remove qtest_qmp_discard_response() & friends, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 25/25] libqtest: Improve error reporting for bad read from QEMU, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 07/25] qobject: New qobject_from_vjsonf_nofail(), qdict_from_vjsonf_nofail(), Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 02/25] libqtest: Clean up how we read device_del messages, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 03/25] libqtest: Clean up how we read the QMP greeting, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 10/25] qobject: qobject_from_jsonv() is dangerous, hide it away, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 05/25] libqtest: Document calling conventions, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 06/25] qobject: Replace qobject_from_jsonf() by qobject_from_jsonf_nofail(), Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 18/25] migration-test: Clean up string interpolation into QMP, part 1, Markus Armbruster, 2018/08/16
- [Qemu-devel] [PULL 22/25] libqtest: Replace qtest_startf() by qtest_initf(), Markus Armbruster, 2018/08/16