Re: [Qemu-devel] [PATCH] input-linux: switch over to -object

[Kashyap Chamarthy]

On Fri, Mar 11, 2016 at 11:01:28AM +0100, Paolo Bonzini wrote:
> 
> 
> On 11/03/2016 08:38, Gerd Hoffmann wrote:
> > This patches makes input-linux use -object instead a new command line

Nit: s/instead a/instead of a/

[If you want to fix up when you apply.]

> > switch.  So, instead of the switch ...
> > 
> > -input-linux /dev/input/event$nr
> > 
> > ... you must create an object this way:
> > 
> > -object input-linux,id=$name,evdev=/dev/input/event$nr
> > 
> > Bonus is that you can hot-add and hot-remove them via monitor now.
> > 
> > Suggested-by: Paolo Bonzini 
> > Signed-off-by: Gerd Hoffmann 
> 
> Great, thank you very much!
> 
> Reviewed-by: Paolo Bonzini 
> 

-- 
/kashyap

Re: [Qemu-devel] [PATCH] input-linux: switch over to -object

[Paolo Bonzini]

On 11/03/2016 08:38, Gerd Hoffmann wrote:
> This patches makes input-linux use -object instead a new command line
> switch.  So, instead of the switch ...
> 
> -input-linux /dev/input/event$nr
> 
> ... you must create an object this way:
> 
> -object input-linux,id=$name,evdev=/dev/input/event$nr
> 
> Bonus is that you can hot-add and hot-remove them via monitor now.
> 
> Suggested-by: Paolo Bonzini 
> Signed-off-by: Gerd Hoffmann 

Great, thank you very much!

Reviewed-by: Paolo Bonzini 

[Qemu-devel] [PATCH] input-linux: switch over to -object

[Gerd Hoffmann]

This patches makes input-linux use -object instead a new command line
switch.  So, instead of the switch ...

-input-linux /dev/input/event$nr

... you must create an object this way:

-object input-linux,id=$name,evdev=/dev/input/event$nr

Bonus is that you can hot-add and hot-remove them via monitor now.

Suggested-by: Paolo Bonzini 
Signed-off-by: Gerd Hoffmann 
---
 qemu-options.hx  |   9 
 ui/input-linux.c | 158 +++
 vl.c |  10 
 3 files changed, 123 insertions(+), 54 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 0cf7bb9..2b3ed86 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1226,15 +1226,6 @@ STEXI
 Set the initial graphical resolution and depth (PPC, SPARC only).
 ETEXI
 
-DEF("input-linux", 1, QEMU_OPTION_input_linux,
-"-input-linux \n"
-"Use input device.\n", QEMU_ARCH_ALL)
-STEXI
-@item -input-linux @var{dev}
-@findex -input-linux
-Use input device.
-ETEXI
-
 DEF("vnc", HAS_ARG, QEMU_OPTION_vnc ,
 "-vnc displaystart a VNC server on display\n", QEMU_ARCH_ALL)
 STEXI
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 0bc0405..59d9348 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -10,6 +10,7 @@
 #include "qemu/sockets.h"
 #include "sysemu/sysemu.h"
 #include "ui/input.h"
+#include "qom/object_interfaces.h"
 
 #include 
 #include "standard-headers/linux/input.h"
@@ -127,10 +128,21 @@ static int qemu_input_linux_to_qcode(unsigned int lnx)
 return linux_to_qcode[lnx];
 }
 
+#define TYPE_INPUT_LINUX "input-linux"
+#define INPUT_LINUX(obj) \
+OBJECT_CHECK(InputLinux, (obj), TYPE_INPUT_LINUX)
+#define INPUT_LINUX_GET_CLASS(obj) \
+OBJECT_GET_CLASS(InputLinuxClass, (obj), TYPE_INPUT_LINUX)
+#define INPUT_LINUX_CLASS(klass) \
+OBJECT_CLASS_CHECK(InputLinuxClass, (klass), TYPE_INPUT_LINUX)
+
 typedef struct InputLinux InputLinux;
+typedef struct InputLinuxClass InputLinuxClass;
 
 struct InputLinux {
-const char  *evdev;
+Object parent;
+
+char*evdev;
 int fd;
 boolrepeat;
 boolgrab_request;
@@ -139,9 +151,14 @@ struct InputLinux {
 boolkeydown[KEY_CNT];
 int keycount;
 int wheel;
+boolinitialized;
 QTAILQ_ENTRY(InputLinux) next;
 };
 
+struct InputLinuxClass {
+ObjectClass parent_class;
+};
+
 static QTAILQ_HEAD(, InputLinux) inputs = QTAILQ_HEAD_INITIALIZER(inputs);
 
 static void input_linux_toggle_grab(InputLinux *il)
@@ -309,25 +326,21 @@ static void input_linux_event_mouse(void *opaque)
 }
 }
 
-int input_linux_init(void *opaque, QemuOpts *opts, Error **errp)
+static void input_linux_complete(UserCreatable *uc, Error **errp)
 {
-InputLinux *il = g_new0(InputLinux, 1);
+InputLinux *il = INPUT_LINUX(uc);
 uint32_t evtmap;
 int rc, ver;
 
-il->evdev = qemu_opt_get(opts, "evdev");
-il->grab_all = qemu_opt_get_bool(opts, "grab-all", false);
-il->repeat = qemu_opt_get_bool(opts, "repeat", false);
-
 if (!il->evdev) {
 error_setg(errp, "no input device specified");
-goto err_free;
+return;
 }
 
 il->fd = open(il->evdev, O_RDWR);
 if (il->fd < 0)  {
 error_setg_file_open(errp, errno, il->evdev);
-goto err_free;
+return;
 }
 qemu_set_nonblock(il->fd);
 
@@ -356,36 +369,111 @@ int input_linux_init(void *opaque, QemuOpts *opts, Error 
**errp)
 }
 input_linux_toggle_grab(il);
 QTAILQ_INSERT_TAIL(, il, next);
-return 0;
+il->initialized = true;
+return;
 
 err_close:
 close(il->fd);
-err_free:
-g_free(il);
-return -1;
-}
-
-static QemuOptsList qemu_input_linux_opts = {
-.name = "input-linux",
-.head = QTAILQ_HEAD_INITIALIZER(qemu_input_linux_opts.head),
-.implied_opt_name = "evdev",
-.desc = {
-{
-.name = "evdev",
-.type = QEMU_OPT_STRING,
-},{
-.name = "grab-all",
-.type = QEMU_OPT_BOOL,
-},{
-.name = "repeat",
-.type = QEMU_OPT_BOOL,
-},
-{ /* end of list */ }
-},
+return;
+}
+
+static void input_linux_instance_finalize(Object *obj)
+{
+InputLinux *il = INPUT_LINUX(obj);
+
+if (il->initialized) {
+QTAILQ_REMOVE(, il, next);
+close(il->fd);
+}
+g_free(il->evdev);
+}
+
+static char *input_linux_get_evdev(Object *obj, Error **errp)
+{
+InputLinux *il = INPUT_LINUX(obj);
+
+return g_strdup(il->evdev);
+}
+
+static void input_linux_set_evdev(Object *obj, const char *value,
+  Error **errp)
+{
+InputLinux *il = INPUT_LINUX(obj);
+
+if (il->evdev) {
+error_setg(errp, "evdev property already set");
+return;
+}
+il->evdev = g_strdup(value);
+}
+
+static bool input_linux_get_grab_all(Object *obj, Error **errp)
+{
+InputLinux