[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/23] libqtest: Simplify qmp_fd_vsend() a bit
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 07/23] libqtest: Simplify qmp_fd_vsend() a bit |
Date: |
Fri, 27 Jul 2018 17:13:43 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/libqtest.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index c2c08a890c..3bfb062fcb 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
- Re: [Qemu-devel] [PATCH v2 05/23] qobject: Replace qobject_from_jsonf() by qobject_from_jsonf_nofail(), (continued)
- [Qemu-devel] [PATCH v2 14/23] migration-test: Make wait_command() return the "return" member, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 01/23] libqtest: Document calling conventions, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 10/23] tests: Pass literal format strings directly to qmp_FOO(), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 13/23] tests: Clean up string interpolation around qtest_qmp_device_add(), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 11/23] tests: Clean up string interpolation into QMP input (simple cases), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 07/23] libqtest: Simplify qmp_fd_vsend() a bit,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 04/23] libqtest: Clean up how we read the QMP greeting, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 02/23] libqtest: Rename functions to send QMP messages, Markus Armbruster, 2018/07/27