[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/15] replay: Use new QAPI cloning
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 15/15] replay: Use new QAPI cloning |
Date: |
Wed, 6 Jul 2016 11:14:06 +0200 |
From: Eric Blake <address@hidden>
Rather than rolling our own clone via an expensive conversion
in and back out of QObject, use the new clone visitor.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
replay/replay-input.c | 30 +++---------------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/replay/replay-input.c b/replay/replay-input.c
index 296399c..bd93554 100644
--- a/replay/replay-input.c
+++ b/replay/replay-input.c
@@ -16,31 +16,7 @@
#include "replay-internal.h"
#include "qemu/notify.h"
#include "ui/input.h"
-#include "qapi/qmp-output-visitor.h"
-#include "qapi/qmp-input-visitor.h"
-#include "qapi-visit.h"
-
-static InputEvent *qapi_clone_InputEvent(InputEvent *src)
-{
- Visitor *ov, *iv;
- QObject *obj;
- InputEvent *dst = NULL;
-
- ov = qmp_output_visitor_new(&obj);
- visit_type_InputEvent(ov, NULL, &src, &error_abort);
- visit_complete(ov, &obj);
- visit_free(ov);
- if (!obj) {
- return NULL;
- }
-
- iv = qmp_input_visitor_new(obj, true);
- visit_type_InputEvent(iv, NULL, &dst, &error_abort);
- visit_free(iv);
- qobject_decref(obj);
-
- return dst;
-}
+#include "qapi/clone-visitor.h"
void replay_save_input_event(InputEvent *evt)
{
@@ -139,7 +115,7 @@ InputEvent *replay_read_input_event(void)
break;
}
- return qapi_clone_InputEvent(&evt);
+ return QAPI_CLONE(InputEvent, &evt);
}
void replay_input_event(QemuConsole *src, InputEvent *evt)
@@ -147,7 +123,7 @@ void replay_input_event(QemuConsole *src, InputEvent *evt)
if (replay_mode == REPLAY_MODE_PLAY) {
/* Nothing */
} else if (replay_mode == REPLAY_MODE_RECORD) {
- replay_add_input_event(qapi_clone_InputEvent(evt));
+ replay_add_input_event(QAPI_CLONE(InputEvent, evt));
} else {
qemu_input_event_send_impl(src, evt);
}
--
2.5.5
- [Qemu-devel] [PULL 00/15] QAPI patches for 2016-07-06, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 02/15] qemu-img: Don't leak errors when outputting JSON, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 01/15] qapi: Improve use of qmp/types.h, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 08/15] string-output-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 05/15] opts-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 06/15] string-input-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 15/15] replay: Use new QAPI cloning,
Markus Armbruster <=
- [Qemu-devel] [PULL 14/15] sockets: Use new QAPI cloning, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 07/15] qmp-input-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 11/15] tests: Factor out common code in qapi output tests, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 10/15] tests: Clean up test-string-output-visitor, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 09/15] qmp-output-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 13/15] qapi: Add new clone visitor, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 03/15] qapi: Add parameter to visit_end_*, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 04/15] qapi: Add new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 12/15] qapi: Add new visit_complete() function, Markus Armbruster, 2016/07/06
- Re: [Qemu-devel] [PULL 00/15] QAPI patches for 2016-07-06, Peter Maydell, 2016/07/06