From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: Justinien Bouron <justinien.bouron@gmail.com>
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Eric Blake" <eblake@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH v3] input-linux: Add option to not grab a device upon guest startup
Date: Tue, 7 May 2024 17:50:09 +0400 [thread overview]
Message-ID: <CAMxuvazcUfBo04ecH+PDXYWfC=cU-Gp-_y2nAUaN2X4+e=qDuA@mail.gmail.com> (raw)
In-Reply-To: <20240403055002.890760-1-justinien.bouron@gmail.com>
Hi
On Wed, Apr 3, 2024 at 9:51 AM Justinien Bouron
<justinien.bouron@gmail.com> wrote:
>
> Depending on your use-case, it might be inconvenient to have qemu grab
> the input device from the host immediately upon starting the guest.
>
> Added a new bool option to input-linux: grab-on-startup. If true, the
> device is grabbed as soon as the guest is started, otherwise it is not
> grabbed until the toggle combination is entered. To avoid breaking
> existing setups, the default value of grab-on-startup is true, i.e. same
> behaviour as before this change.
>
> Signed-off-by: Justinien Bouron <justinien.bouron@gmail.com>
> ---
>
> Changes since v2:
> - Added missing (since 9.1) to the new option in qapi/qom.json
>
> qapi/qom.json | 14 +++++++++++++-
> ui/input-linux.c | 20 +++++++++++++++++++-
> 2 files changed, 32 insertions(+), 2 deletions(-)
>
> diff --git a/qapi/qom.json b/qapi/qom.json
> index 85e6b4f84a..2067e41991 100644
> --- a/qapi/qom.json
> +++ b/qapi/qom.json
> @@ -508,13 +508,25 @@
> # @grab-toggle: the key or key combination that toggles device grab
> # (default: ctrl-ctrl)
> #
> +# @grab-on-startup: if true, grab the device immediately upon starting
> +# the guest. Otherwise, don't grab the device until the
> +# combination is entered. This does not influence other devices
> +# even if grab_all is true, i.e. in the unlikely scenario where
> +# device1 has grab_all=true + grab-on-startup=true and device2 has
> +# grab-on-startup=false, only device1 is grabbed on startup, then,
> +# once the grab combination is entered, grabbing is toggled off
> +# for both devices (because device1 enforces the grab_all
> +# property) until the combination is entered again at which point
> +# both devices will be grabbed. (default: true) (since 9.1).
> +#
> # Since: 2.6
> ##
> { 'struct': 'InputLinuxProperties',
> 'data': { 'evdev': 'str',
> '*grab_all': 'bool',
> '*repeat': 'bool',
> - '*grab-toggle': 'GrabToggleKeys' } }
> + '*grab-toggle': 'GrabToggleKeys',
> + '*grab-on-startup': 'bool'} }
>
> ##
> # @EventLoopBaseProperties:
> diff --git a/ui/input-linux.c b/ui/input-linux.c
> index e572a2e905..68b5c6d485 100644
> --- a/ui/input-linux.c
> +++ b/ui/input-linux.c
> @@ -44,6 +44,7 @@ struct InputLinux {
> bool grab_request;
> bool grab_active;
> bool grab_all;
> + bool grab_on_startup;
> bool keydown[KEY_CNT];
> int keycount;
> int wheel;
> @@ -400,7 +401,7 @@ static void input_linux_complete(UserCreatable *uc, Error **errp)
> if (il->keycount) {
> /* delay grab until all keys are released */
> il->grab_request = true;
> - } else {
> + } else if (il->grab_on_startup) {
> input_linux_toggle_grab(il);
> }
The patch looks ok to me, but you don't handle the case where keys are
pressed at startup and the grab is delayed. You could add a if
(!il->grab_on_startup) goto skip_grab, probably instead.
> QTAILQ_INSERT_TAIL(&inputs, il, next);
> @@ -491,6 +492,19 @@ static void input_linux_set_grab_toggle(Object *obj, int value,
> il->grab_toggle = value;
> }
>
> +static bool input_linux_get_grab_on_startup(Object *obj, Error **errp)
> +{
> + InputLinux *il = INPUT_LINUX(obj);
> + return il->grab_on_startup;
> +}
> +
> +static void input_linux_set_grab_on_startup(Object *obj, bool value,
> + Error **errp)
> +{
> + InputLinux *il = INPUT_LINUX(obj);
> + il->grab_on_startup = value;
> +}
> +
> static void input_linux_instance_init(Object *obj)
> {
> }
> @@ -498,6 +512,7 @@ static void input_linux_instance_init(Object *obj)
> static void input_linux_class_init(ObjectClass *oc, void *data)
> {
> UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
> + ObjectProperty *grab_on_startup_prop;
>
> ucc->complete = input_linux_complete;
>
> @@ -514,6 +529,9 @@ static void input_linux_class_init(ObjectClass *oc, void *data)
> &GrabToggleKeys_lookup,
> input_linux_get_grab_toggle,
> input_linux_set_grab_toggle);
> + grab_on_startup_prop = object_class_property_add_bool(oc, "grab-on-startup",
> + input_linux_get_grab_on_startup, input_linux_set_grab_on_startup);
> + object_property_set_default_bool(grab_on_startup_prop, true);
> }
>
> static const TypeInfo input_linux_info = {
> --
> 2.44.0
>
prev parent reply other threads:[~2024-05-07 13:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 5:50 [PATCH v3] input-linux: Add option to not grab a device upon guest startup Justinien Bouron
2024-04-03 12:19 ` Markus Armbruster
2024-04-03 15:45 ` Justinien Bouron
2024-04-03 18:33 ` Markus Armbruster
2024-04-30 2:16 ` Justinien Bouron
2024-05-07 13:50 ` Marc-André Lureau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMxuvazcUfBo04ecH+PDXYWfC=cU-Gp-_y2nAUaN2X4+e=qDuA@mail.gmail.com' \
--to=marcandre.lureau@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=justinien.bouron@gmail.com \
--cc=kraxel@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).