[v1] Update to latest keycodemapdb content

[libvirt] [PATCH] Update to latest keycodemapdb content

Posted by Daniel P. Berrange 7 years, 9 months ago

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 src/Makefile.am       | 2 +-
 src/keycodemapdb      | 2 +-
 src/util/virkeycode.c | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b8e875482..45b58c0ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -252,7 +252,7 @@ util/virkey%.7: util/virkey%.pod
 	rm -f $@-t1 && \
 	mv $@-t2 $@
 
-KEYCODES = linux osx atset1 atset2 atset3 xt xtkbd usb win32 rfb
+KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb
 KEYNAMES = linux osx win32
 
 KEYTABLES = \
diff --git a/src/keycodemapdb b/src/keycodemapdb
index 7bf5710b2..cb0a08d47 160000
--- a/src/keycodemapdb
+++ b/src/keycodemapdb
@@ -1 +1 @@
-Subproject commit 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0
+Subproject commit cb0a08d4726d93922a25e1285d34179ac278ebf8
diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c
index e09aaadaa..eda263218 100644
--- a/src/util/virkeycode.c
+++ b/src/util/virkeycode.c
@@ -30,7 +30,6 @@
 #include "virkeycodetable_rfb.h"
 #include "virkeycodetable_usb.h"
 #include "virkeycodetable_win32.h"
-#include "virkeycodetable_xt.h"
 #include "virkeycodetable_xtkbd.h"
 #include "virkeynametable_linux.h"
 #include "virkeynametable_osx.h"
@@ -44,7 +43,8 @@ static const char **virKeymapNames[VIR_KEYCODE_SET_LAST] = {
 
 static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = {
     [VIR_KEYCODE_SET_LINUX] = virKeyCodeTable_linux,
-    [VIR_KEYCODE_SET_XT] = virKeyCodeTable_xt,
+    /* XT is same as AT Set1 - it was included by mistake */
+    [VIR_KEYCODE_SET_XT] = virKeyCodeTable_atset1,
     [VIR_KEYCODE_SET_ATSET1] = virKeyCodeTable_atset1,
     [VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2,
     [VIR_KEYCODE_SET_ATSET3] = virKeyCodeTable_atset3,
@@ -57,7 +57,6 @@ static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = {
 
 #define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux)
 
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_xt));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset1));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset2));
 verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset3));
-- 
2.13.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Update to latest keycodemapdb content

Posted by Andrea Bolognani 7 years, 9 months ago

On Mon, 2017-08-07 at 14:38 +0100, Daniel P. Berrange wrote:
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  src/Makefile.am       | 2 +-
>  src/keycodemapdb      | 2 +-
>  src/util/virkeycode.c | 5 ++---
>  3 files changed, 4 insertions(+), 5 deletions(-)

The changes look sane, but the test suite is not happy:

  $ VIR_TEST_DEBUG=1 ./tests/virkeycodetest
  TEST: virkeycodetest
   1) Keycode mapping ... Translating 259 from ATSET2
      to ATSET3, got -1 want 55
  FAILED

Seems unrelated to your changes though, perhaps a
regression in keycodemapdb?

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Update to latest keycodemapdb content

Posted by Daniel P. Berrange 7 years, 9 months ago

On Tue, Aug 08, 2017 at 02:09:17PM +0200, Andrea Bolognani wrote:
> On Mon, 2017-08-07 at 14:38 +0100, Daniel P. Berrange wrote:
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> >  src/Makefile.am       | 2 +-
> >  src/keycodemapdb      | 2 +-
> >  src/util/virkeycode.c | 5 ++---
> >  3 files changed, 4 insertions(+), 5 deletions(-)
> 
> The changes look sane, but the test suite is not happy:
> 
>   $ VIR_TEST_DEBUG=1 ./tests/virkeycodetest
>   TEST: virkeycodetest
>    1) Keycode mapping ... Translating 259 from ATSET2
>       to ATSET3, got -1 want 55
>   FAILED
> 
> Seems unrelated to your changes though, perhaps a
> regression in keycodemapdb?

No, its a fix in keycodemapdb. A sheer good fortune, the scancodes we
decided to test were incorrectly defined. So when we fixed the mappings
in keycodemapdb, we broke the tests :-)

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 :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list