mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-02 03:11:12 +00:00
d27efd8e5d
Playing games with field offsets in a struct causes all sorts
of alignment warnings on ARM platforms
util/virkeycode.c: In function '__virKeycodeValueFromString':
util/virkeycode.c:26:7: warning: cast increases required alignment of target type [-Wcast-align]
(*(typeof(field_type) *)((char *)(object) + field_offset))
^
util/virkeycode.c:91:28: note: in expansion of macro 'getfield'
const char *name = getfield(virKeycodes + i, const char *, name_offset);
^
util/virkeycode.c:26:7: warning: cast increases required alignment of target type [-Wcast-align]
(*(typeof(field_type) *)((char *)(object) + field_offset))
^
util/virkeycode.c:94:20: note: in expansion of macro 'getfield'
return getfield(virKeycodes + i, unsigned short, code_offset);
^
util/virkeycode.c: In function '__virKeycodeValueTranslate':
util/virkeycode.c:26:7: warning: cast increases required alignment of target type [-Wcast-align]
(*(typeof(field_type) *)((char *)(object) + field_offset))
^
util/virkeycode.c:127:13: note: in expansion of macro 'getfield'
if (getfield(virKeycodes + i, unsigned short, from_offset) == key_value)
^
util/virkeycode.c:26:7: warning: cast increases required alignment of target type [-Wcast-align]
(*(typeof(field_type) *)((char *)(object) + field_offset))
^
util/virkeycode.c:128:20: note: in expansion of macro 'getfield'
return getfield(virKeycodes + i, unsigned short, to_offset);
There is no compelling reason to use a struct for the keycode
tables. It can easily just use an array of arrays instead,
avoiding all alignment problems
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
127 lines
3.1 KiB
C
127 lines
3.1 KiB
C
/*
|
|
* Copyright (c) 2011 Lai Jiangshan
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "virkeycode.h"
|
|
#include <string.h>
|
|
#include <stddef.h>
|
|
|
|
|
|
#define VIRT_KEY_INTERNAL
|
|
#include "virkeymaps.h"
|
|
|
|
static const char **virKeymapNames[] = {
|
|
[VIR_KEYCODE_SET_LINUX] =
|
|
virKeymapNames_linux,
|
|
[VIR_KEYCODE_SET_XT] =
|
|
NULL,
|
|
[VIR_KEYCODE_SET_ATSET1] =
|
|
NULL,
|
|
[VIR_KEYCODE_SET_ATSET2] =
|
|
NULL,
|
|
[VIR_KEYCODE_SET_ATSET3] =
|
|
NULL,
|
|
[VIR_KEYCODE_SET_OSX] =
|
|
virKeymapNames_os_x,
|
|
[VIR_KEYCODE_SET_XT_KBD] =
|
|
NULL,
|
|
[VIR_KEYCODE_SET_USB] =
|
|
NULL,
|
|
[VIR_KEYCODE_SET_WIN32] =
|
|
virKeymapNames_win32,
|
|
[VIR_KEYCODE_SET_RFB] =
|
|
NULL,
|
|
};
|
|
verify(ARRAY_CARDINALITY(virKeymapNames) == VIR_KEYCODE_SET_LAST);
|
|
|
|
static unsigned short *virKeymapValues[] = {
|
|
[VIR_KEYCODE_SET_LINUX] =
|
|
virKeymapValues_linux,
|
|
[VIR_KEYCODE_SET_XT] =
|
|
virKeymapValues_xt,
|
|
[VIR_KEYCODE_SET_ATSET1] =
|
|
virKeymapValues_atset1,
|
|
[VIR_KEYCODE_SET_ATSET2] =
|
|
virKeymapValues_atset2,
|
|
[VIR_KEYCODE_SET_ATSET3] =
|
|
virKeymapValues_atset3,
|
|
[VIR_KEYCODE_SET_OSX] =
|
|
virKeymapValues_os_x,
|
|
[VIR_KEYCODE_SET_XT_KBD] =
|
|
virKeymapValues_xt_kbd,
|
|
[VIR_KEYCODE_SET_USB] =
|
|
virKeymapValues_usb,
|
|
[VIR_KEYCODE_SET_WIN32] =
|
|
virKeymapValues_win32,
|
|
[VIR_KEYCODE_SET_RFB] =
|
|
virKeymapValues_rfb,
|
|
};
|
|
verify(ARRAY_CARDINALITY(virKeymapValues) == VIR_KEYCODE_SET_LAST);
|
|
|
|
VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST,
|
|
"linux",
|
|
"xt",
|
|
"atset1",
|
|
"atset2",
|
|
"atset3",
|
|
"os_x",
|
|
"xt_kbd",
|
|
"usb",
|
|
"win32",
|
|
"rfb",
|
|
);
|
|
|
|
int virKeycodeValueFromString(virKeycodeSet codeset,
|
|
const char *keyname)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < VIR_KEYMAP_ENTRY_MAX; i++) {
|
|
if (!virKeymapNames[codeset] ||
|
|
!virKeymapValues[codeset])
|
|
continue;
|
|
|
|
const char *name = virKeymapNames[codeset][i];
|
|
|
|
if (name && STREQ_NULLABLE(name, keyname))
|
|
return virKeymapValues[codeset][i];
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
|
|
int virKeycodeValueTranslate(virKeycodeSet from_codeset,
|
|
virKeycodeSet to_codeset,
|
|
int key_value)
|
|
{
|
|
int i;
|
|
|
|
if (key_value <= 0)
|
|
return -1;
|
|
|
|
|
|
for (i = 0; i < VIR_KEYMAP_ENTRY_MAX; i++) {
|
|
if (virKeymapValues[from_codeset][i] == key_value)
|
|
return virKeymapValues[to_codeset][i];
|
|
}
|
|
|
|
return -1;
|
|
}
|