2015-09-17 18:25:24 +02:00
|
|
|
/*
|
|
|
|
* replay-input.c
|
|
|
|
*
|
|
|
|
* Copyright (c) 2010-2015 Institute for System Programming
|
|
|
|
* of the Russian Academy of Sciences.
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-01-29 18:50:05 +01:00
|
|
|
#include "qemu/osdep.h"
|
2015-09-17 18:25:24 +02:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "sysemu/replay.h"
|
|
|
|
#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)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov;
|
|
|
|
QmpInputVisitor *qiv;
|
|
|
|
Visitor *ov, *iv;
|
|
|
|
QObject *obj;
|
|
|
|
InputEvent *dst = NULL;
|
|
|
|
|
|
|
|
qov = qmp_output_visitor_new();
|
|
|
|
ov = qmp_output_get_visitor(qov);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_InputEvent(ov, NULL, &src, &error_abort);
|
2015-09-17 18:25:24 +02:00
|
|
|
obj = qmp_output_get_qobject(qov);
|
|
|
|
qmp_output_visitor_cleanup(qov);
|
|
|
|
if (!obj) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
qiv = qmp_input_visitor_new(obj);
|
|
|
|
iv = qmp_input_get_visitor(qiv);
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_InputEvent(iv, NULL, &dst, &error_abort);
|
2015-09-17 18:25:24 +02:00
|
|
|
qmp_input_visitor_cleanup(qiv);
|
|
|
|
qobject_decref(obj);
|
|
|
|
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
void replay_save_input_event(InputEvent *evt)
|
|
|
|
{
|
2016-03-03 17:16:49 +01:00
|
|
|
InputKeyEvent *key;
|
|
|
|
InputBtnEvent *btn;
|
|
|
|
InputMoveEvent *move;
|
2015-09-17 18:25:24 +02:00
|
|
|
replay_put_dword(evt->type);
|
|
|
|
|
|
|
|
switch (evt->type) {
|
|
|
|
case INPUT_EVENT_KIND_KEY:
|
2016-03-03 17:16:49 +01:00
|
|
|
key = evt->u.key;
|
|
|
|
replay_put_dword(key->key->type);
|
2015-09-17 18:25:24 +02:00
|
|
|
|
2016-03-03 17:16:49 +01:00
|
|
|
switch (key->key->type) {
|
2015-09-17 18:25:24 +02:00
|
|
|
case KEY_VALUE_KIND_NUMBER:
|
2016-03-03 17:16:49 +01:00
|
|
|
replay_put_qword(key->key->u.number);
|
|
|
|
replay_put_byte(key->down);
|
2015-09-17 18:25:24 +02:00
|
|
|
break;
|
|
|
|
case KEY_VALUE_KIND_QCODE:
|
2016-03-03 17:16:49 +01:00
|
|
|
replay_put_dword(key->key->u.qcode);
|
|
|
|
replay_put_byte(key->down);
|
2015-09-17 18:25:24 +02:00
|
|
|
break;
|
qapi: Don't let implicit enum MAX member collide
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-11-18 09:52:57 +01:00
|
|
|
case KEY_VALUE_KIND__MAX:
|
2015-09-17 18:25:24 +02:00
|
|
|
/* keep gcc happy */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case INPUT_EVENT_KIND_BTN:
|
2016-03-03 17:16:49 +01:00
|
|
|
btn = evt->u.btn;
|
|
|
|
replay_put_dword(btn->button);
|
|
|
|
replay_put_byte(btn->down);
|
2015-09-17 18:25:24 +02:00
|
|
|
break;
|
|
|
|
case INPUT_EVENT_KIND_REL:
|
2016-03-03 17:16:49 +01:00
|
|
|
move = evt->u.rel;
|
|
|
|
replay_put_dword(move->axis);
|
|
|
|
replay_put_qword(move->value);
|
2015-09-17 18:25:24 +02:00
|
|
|
break;
|
|
|
|
case INPUT_EVENT_KIND_ABS:
|
2016-03-03 17:16:49 +01:00
|
|
|
move = evt->u.abs;
|
|
|
|
replay_put_dword(move->axis);
|
|
|
|
replay_put_qword(move->value);
|
2015-09-17 18:25:24 +02:00
|
|
|
break;
|
qapi: Don't let implicit enum MAX member collide
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-11-18 09:52:57 +01:00
|
|
|
case INPUT_EVENT_KIND__MAX:
|
2015-09-17 18:25:24 +02:00
|
|
|
/* keep gcc happy */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
InputEvent *replay_read_input_event(void)
|
|
|
|
{
|
|
|
|
InputEvent evt;
|
|
|
|
KeyValue keyValue;
|
|
|
|
InputKeyEvent key;
|
|
|
|
key.key = &keyValue;
|
|
|
|
InputBtnEvent btn;
|
|
|
|
InputMoveEvent rel;
|
|
|
|
InputMoveEvent abs;
|
|
|
|
|
|
|
|
evt.type = replay_get_dword();
|
|
|
|
switch (evt.type) {
|
|
|
|
case INPUT_EVENT_KIND_KEY:
|
|
|
|
evt.u.key = &key;
|
|
|
|
evt.u.key->key->type = replay_get_dword();
|
|
|
|
|
|
|
|
switch (evt.u.key->key->type) {
|
|
|
|
case KEY_VALUE_KIND_NUMBER:
|
|
|
|
evt.u.key->key->u.number = replay_get_qword();
|
|
|
|
evt.u.key->down = replay_get_byte();
|
|
|
|
break;
|
|
|
|
case KEY_VALUE_KIND_QCODE:
|
|
|
|
evt.u.key->key->u.qcode = (QKeyCode)replay_get_dword();
|
|
|
|
evt.u.key->down = replay_get_byte();
|
|
|
|
break;
|
qapi: Don't let implicit enum MAX member collide
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-11-18 09:52:57 +01:00
|
|
|
case KEY_VALUE_KIND__MAX:
|
2015-09-17 18:25:24 +02:00
|
|
|
/* keep gcc happy */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case INPUT_EVENT_KIND_BTN:
|
|
|
|
evt.u.btn = &btn;
|
|
|
|
evt.u.btn->button = (InputButton)replay_get_dword();
|
|
|
|
evt.u.btn->down = replay_get_byte();
|
|
|
|
break;
|
|
|
|
case INPUT_EVENT_KIND_REL:
|
|
|
|
evt.u.rel = &rel;
|
|
|
|
evt.u.rel->axis = (InputAxis)replay_get_dword();
|
|
|
|
evt.u.rel->value = replay_get_qword();
|
|
|
|
break;
|
|
|
|
case INPUT_EVENT_KIND_ABS:
|
|
|
|
evt.u.abs = &abs;
|
|
|
|
evt.u.abs->axis = (InputAxis)replay_get_dword();
|
|
|
|
evt.u.abs->value = replay_get_qword();
|
|
|
|
break;
|
qapi: Don't let implicit enum MAX member collide
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-11-18 09:52:57 +01:00
|
|
|
case INPUT_EVENT_KIND__MAX:
|
2015-09-17 18:25:24 +02:00
|
|
|
/* keep gcc happy */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return qapi_clone_InputEvent(&evt);
|
|
|
|
}
|
|
|
|
|
|
|
|
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));
|
|
|
|
} else {
|
|
|
|
qemu_input_event_send_impl(src, evt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void replay_input_sync_event(void)
|
|
|
|
{
|
|
|
|
if (replay_mode == REPLAY_MODE_PLAY) {
|
|
|
|
/* Nothing */
|
|
|
|
} else if (replay_mode == REPLAY_MODE_RECORD) {
|
|
|
|
replay_add_input_sync_event();
|
|
|
|
} else {
|
|
|
|
qemu_input_event_sync_impl();
|
|
|
|
}
|
|
|
|
}
|