[Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Daniel P. Berrange]

This patch series is an update to:

  v1: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02047.html
  v2: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02471.html
  v3: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02517.html
  v4: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02708.html
  v5: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg02950.html
  v6: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07673.html
  v7: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07740.html

The keycodemap project[1] provides a database mapping between many different
keysym/keycode/scancode sets, along with a tool to generate mapping/lookup
tables in various programming languages. It is already used by GTK-VNC,
SPICE-GTK and libvirt.

In this v6 posting I have dropped most of the conversion to keycodemapdb
across the devices / UI frontends. This only converts the core input
APIs, and wires up the git submodule build system mechanics. The remaining
patches from the v5 posting will be submitted separately, once this initial
conversion is mergable.

Changed in v8:

 - Fix error checking in archive-source.sh changes (Eric)
 - Use -e instead of -d to check for .git (Eric)
 - Misc typos (Eric)
 - Use && instead of ; in make shell rules (Eric)
 - Fully quote $source_path usage (Eric)
 - Fix position of trap statement for cleanup (Eric)
 - Added missing dependnacy for Makefile (Patchew)
 - Moved build rules from ui/Makefile.objs into Makefile because
   we must not have those rules defined in the target specific
   Makefiles

Changed in v7:

 - subdir-dtc and ui/input-keymap-* make rules must depend on
   the submodule status file to ensure build ordering (patchew)
 - Use 'git stash' to ensure archive-source.sh keeps non-committed
   changes for docker/vm testing (Fam)

Changed in v6:

 - Switched back to using a git submodule
 - Wire up Makefile rules so that git submodule is automatically
   refreshed when needed prior to build.
 - Fix source tarball creation for docker/vm tests wrt submodules

Changed in v5:

 - Don't try to initialize git submodule at all
 - Store generate keymap files in GIT

Changed in v4:

 - Run submodule update in source_dir for vpath builds (patchew)
 - Force submodule update in docker rules in case they
   are run without configure (patchew)

Changed in v3:

 - Ensure docker builds pull in keycodemapdb submodule (patchew)
 - Add compat with py26 for RHEL-6 in keycodemapdb tools (patchew)
 - Initialize submodule in configure script (patchew)

Changed in v2:

 - Change filename pattern to 'ui/input-keymap-$SRC-to-$DST.c'
   and map names 'qemu_input_map_$SRC_to_$DST'  (Eric)
 - Fix typos (Eric)
 - Drop changes to InputKeyEvent struct (Eric)
 - Fix VPATH build (patchew)
 - Fix code style errors (patchew)

[1] https://gitlab.com/keycodemap/keycodemapdb/

Daniel P. Berrange (6):
  build: automatically handle GIT submodule checkout for dtc
  docker: don't rely on submodules existing in the main checkout
  ui: add keycodemapdb repository as a GIT submodule
  ui: convert common input code to keycodemapdb
  ui: convert key events to QKeyCodes immediately
  ui: don't export qemu_input_event_new_key

 .gitignore                |   2 +
 .gitmodules               |   3 +
 MAINTAINERS               |   6 +
 Makefile                  |  46 ++++++-
 configure                 |  52 +++++---
 include/ui/input.h        |  12 +-
 scripts/archive-source.sh |  34 ++++-
 scripts/git-submodule.sh  |  38 ++++++
 ui/input-keymap.c         | 326 +++-------------------------------------------
 ui/input.c                |  26 ++--
 ui/keycodemapdb           |   1 +
 11 files changed, 198 insertions(+), 348 deletions(-)
 create mode 100755 scripts/git-submodule.sh
 create mode 160000 ui/keycodemapdb

-- 
2.13.5

Re: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Programmingkid]

> This patch series is an update to:
<snip>

For some reason this patch series isn't showing up in your patchworks page:
https://patchwork.ozlabs.org/project/qemu-devel/list/?submitter=2694

Did you do something different? 


Had to send this email again because the qemu-devel address was incorrect in my first email. 

Re: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Daniel P. Berrange]

FYI, in case people were wondering, patchew successfully passed all
tests. So it looks like 8th time lucky for getting submodules working
correctly unless someone can break it again.....

  http://patchew.org/QEMU/20170929101201.21039-1-berrange@redhat.com/

On Fri, Sep 29, 2017 at 11:11:55AM +0100, Daniel P. Berrange wrote:
> This patch series is an update to:
> 
>   v1: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02047.html
>   v2: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02471.html
>   v3: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02517.html
>   v4: https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02708.html
>   v5: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg02950.html
>   v6: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07673.html
>   v7: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg07740.html
> 
> The keycodemap project[1] provides a database mapping between many different
> keysym/keycode/scancode sets, along with a tool to generate mapping/lookup
> tables in various programming languages. It is already used by GTK-VNC,
> SPICE-GTK and libvirt.
> 
> In this v6 posting I have dropped most of the conversion to keycodemapdb
> across the devices / UI frontends. This only converts the core input
> APIs, and wires up the git submodule build system mechanics. The remaining
> patches from the v5 posting will be submitted separately, once this initial
> conversion is mergable.
> 
> Changed in v8:
> 
>  - Fix error checking in archive-source.sh changes (Eric)
>  - Use -e instead of -d to check for .git (Eric)
>  - Misc typos (Eric)
>  - Use && instead of ; in make shell rules (Eric)
>  - Fully quote $source_path usage (Eric)
>  - Fix position of trap statement for cleanup (Eric)
>  - Added missing dependnacy for Makefile (Patchew)
>  - Moved build rules from ui/Makefile.objs into Makefile because
>    we must not have those rules defined in the target specific
>    Makefiles
> 
> Changed in v7:
> 
>  - subdir-dtc and ui/input-keymap-* make rules must depend on
>    the submodule status file to ensure build ordering (patchew)
>  - Use 'git stash' to ensure archive-source.sh keeps non-committed
>    changes for docker/vm testing (Fam)
> 
> Changed in v6:
> 
>  - Switched back to using a git submodule
>  - Wire up Makefile rules so that git submodule is automatically
>    refreshed when needed prior to build.
>  - Fix source tarball creation for docker/vm tests wrt submodules
> 
> Changed in v5:
> 
>  - Don't try to initialize git submodule at all
>  - Store generate keymap files in GIT
> 
> Changed in v4:
> 
>  - Run submodule update in source_dir for vpath builds (patchew)
>  - Force submodule update in docker rules in case they
>    are run without configure (patchew)
> 
> Changed in v3:
> 
>  - Ensure docker builds pull in keycodemapdb submodule (patchew)
>  - Add compat with py26 for RHEL-6 in keycodemapdb tools (patchew)
>  - Initialize submodule in configure script (patchew)
> 
> Changed in v2:
> 
>  - Change filename pattern to 'ui/input-keymap-$SRC-to-$DST.c'
>    and map names 'qemu_input_map_$SRC_to_$DST'  (Eric)
>  - Fix typos (Eric)
>  - Drop changes to InputKeyEvent struct (Eric)
>  - Fix VPATH build (patchew)
>  - Fix code style errors (patchew)
> 
> [1] https://gitlab.com/keycodemap/keycodemapdb/
> 
> Daniel P. Berrange (6):
>   build: automatically handle GIT submodule checkout for dtc
>   docker: don't rely on submodules existing in the main checkout
>   ui: add keycodemapdb repository as a GIT submodule
>   ui: convert common input code to keycodemapdb
>   ui: convert key events to QKeyCodes immediately
>   ui: don't export qemu_input_event_new_key
> 
>  .gitignore                |   2 +
>  .gitmodules               |   3 +
>  MAINTAINERS               |   6 +
>  Makefile                  |  46 ++++++-
>  configure                 |  52 +++++---
>  include/ui/input.h        |  12 +-
>  scripts/archive-source.sh |  34 ++++-
>  scripts/git-submodule.sh  |  38 ++++++
>  ui/input-keymap.c         | 326 +++-------------------------------------------
>  ui/input.c                |  26 ++--
>  ui/keycodemapdb           |   1 +
>  11 files changed, 198 insertions(+), 348 deletions(-)
>  create mode 100755 scripts/git-submodule.sh
>  create mode 160000 ui/keycodemapdb
> 
> -- 
> 2.13.5
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Daniel P. Berrange]

On Mon, Oct 02, 2017 at 10:18:38AM +0100, Daniel P. Berrange wrote:
> On Fri, Sep 29, 2017 at 05:29:53PM -0400, Programmingkid wrote:
> > 
> > > On Sep 29, 2017, at 6:12 AM, qemu-devel-request@gnu.org wrote:
> > > 
> > > Message: 15
> > > Date: Fri, 29 Sep 2017 11:11:55 +0100
> > > From: "Daniel P. Berrange" <berrange@redhat.com <mailto:berrange@redhat.com>>
> > > To: qemu-devel@nongnu.org <mailto:qemu-devel@nongnu.org>
> > > Cc: Fam Zheng <famz@redhat.com <mailto:famz@redhat.com>>, Gerd Hoffmann <kraxel@redhat.com <mailto:kraxel@redhat.com>>,
> > > 	Peter Maydell <peter.maydell@linaro.org <mailto:peter.maydell@linaro.org>>,	Paolo Bonzini
> > > 	<pbonzini@redhat.com <mailto:pbonzini@redhat.com>>,	"Daniel P. Berrange" <berrange@redhat.com <mailto:berrange@redhat.com>>
> > > Subject: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb
> > > 	GIT submodule
> > > Message-ID: <20170929101201.21039-1-berrange@redhat.com <mailto:20170929101201.21039-1-berrange@redhat.com>>
> > > 
> > > This patch series is an update to:
> > > 
> > <snip>
> > 
> > For some reason this patch series isn't showing up in your patchworks page:
> > https://patchwork.ozlabs.org/project/qemu-devel/list/?submitter=2694
> 
> I dunno who maintains that service, but it is not showing *any* qemu-devel
> mail that has been sent since the list-id header changed from nongnu.org
> to gnu.org

Managed to track down an admin for patchwork and they fixed its list-id
filter, so it should start getting emails again. Unfortunately I think
any mails betwen Sept 28th and today will be lost from patchwork forever.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Programmingkid]

> On Oct 2, 2017, at 6:11 AM, qemu-devel-request@gnu.org wrote:
> 
> Message: 21
> Date: Mon, 2 Oct 2017 10:56:27 +0100
> From: "Daniel P. Berrange" <berrange@redhat.com>
> To: qemu-devel@nongnu.org
> Cc: Fam Zheng <famz@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>,
> 	Peter Maydell <peter.maydell@linaro.org>,	Paolo Bonzini
> 	<pbonzini@redhat.com>
> Subject: Re: [Qemu-devel] [PATCH v8 0/6] Initial support for
> 	keycodemapdb GIT submodule
> Message-ID: <20171002095627.GD27086@redhat.com>
> Content-Type: text/plain; charset=utf-8
> 
> FYI, in case people were wondering, patchew successfully passed all
> tests. So it looks like 8th time lucky for getting submodules working
> correctly unless someone can break it again.....
> 
>  http://patchew.org/QEMU/20170929101201.21039-1-berrange@redhat.com/

Using the above link I was able to copy and paste your patches to my computer. The problem was 'git am' kept saying "Patch format detection failed". Using 'git apply' was what I used instead. After running 'make' I saw this error: 

  GEN     config-host.h
  GIT     ui/keycodemapdb dtc
make: *** [git-submodule-update] Error 1

Re: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Fam Zheng]

On Mon, 10/02 11:52, Programmingkid wrote:
> 
> > On Oct 2, 2017, at 6:11 AM, qemu-devel-request@gnu.org wrote:
> > 
> > Message: 21
> > Date: Mon, 2 Oct 2017 10:56:27 +0100
> > From: "Daniel P. Berrange" <berrange@redhat.com>
> > To: qemu-devel@nongnu.org
> > Cc: Fam Zheng <famz@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>,
> > 	Peter Maydell <peter.maydell@linaro.org>,	Paolo Bonzini
> > 	<pbonzini@redhat.com>
> > Subject: Re: [Qemu-devel] [PATCH v8 0/6] Initial support for
> > 	keycodemapdb GIT submodule
> > Message-ID: <20171002095627.GD27086@redhat.com>
> > Content-Type: text/plain; charset=utf-8
> > 
> > FYI, in case people were wondering, patchew successfully passed all
> > tests. So it looks like 8th time lucky for getting submodules working
> > correctly unless someone can break it again.....
> > 
> >  http://patchew.org/QEMU/20170929101201.21039-1-berrange@redhat.com/
> 
> Using the above link I was able to copy and paste your patches to my computer. The problem was 'git am' kept saying "Patch format detection failed". Using 'git apply' was what I used instead. After running 'make' I saw this error: 

Since you've noticed the link: in the beginning of that page there is also an
easy way to get the patches by one command:

> git fetch https://github.com/patchew-project/qemu patchew/20170929101201.21039-1-berrange@redhat.com

Fam

Re: [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule

[Programmingkid]

> On Oct 4, 2017, at 1:48 AM, Fam Zheng <famz@redhat.com> wrote:
> 
> On Mon, 10/02 11:52, Programmingkid wrote:
>> 
>>> On Oct 2, 2017, at 6:11 AM, qemu-devel-request@gnu.org wrote:
>>> 
>>> Message: 21
>>> Date: Mon, 2 Oct 2017 10:56:27 +0100
>>> From: "Daniel P. Berrange" <berrange@redhat.com>
>>> To: qemu-devel@nongnu.org
>>> Cc: Fam Zheng <famz@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>,
>>> 	Peter Maydell <peter.maydell@linaro.org>,	Paolo Bonzini
>>> 	<pbonzini@redhat.com>
>>> Subject: Re: [Qemu-devel] [PATCH v8 0/6] Initial support for
>>> 	keycodemapdb GIT submodule
>>> Message-ID: <20171002095627.GD27086@redhat.com>
>>> Content-Type: text/plain; charset=utf-8
>>> 
>>> FYI, in case people were wondering, patchew successfully passed all
>>> tests. So it looks like 8th time lucky for getting submodules working
>>> correctly unless someone can break it again.....
>>> 
>>> http://patchew.org/QEMU/20170929101201.21039-1-berrange@redhat.com/
>> 
>> Using the above link I was able to copy and paste your patches to my computer. The problem was 'git am' kept saying "Patch format detection failed". Using 'git apply' was what I used instead. After running 'make' I saw this error: 
> 
> Since you've noticed the link: in the beginning of that page there is also an
> easy way to get the patches by one command:
> 
>> git fetch https://github.com/patchew-project/qemu patchew/20170929101201.21039-1-berrange@redhat.com
> 
> Fam

Thank you very much for the info. I was able to finally 'make' QEMU with this patch set. Didn't notice any problems with qemu-system-ppc or qemu-system-i386.