Merge upstream QEMU 10.0.50 into the Android source tree.

This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.

Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:

  net.c        net-android.c
  qemu-char.c  qemu-char-android.c
  slirp/       slirp-android/
  etc...

Tested on linux-x86, darwin-x86 and windows host machines.

1 files changed, 9 insertions, 10 deletions

diff --git a/curses_keys.h b/curses_keys.h
index 27f9cd8..4c6f3db 100644
--- a/curses_keys.h
+++ b/curses_keys.h
@@ -21,6 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+#include "keymaps.h"
+
+
 #define KEY_RELEASE         0x80
 #define KEY_MASK            0x7f
 #define SHIFT_CODE          0x2a
@@ -37,7 +41,7 @@
 
 #define CURSES_KEYS         KEY_MAX     /* KEY_MAX defined in <curses.h> */
 
-int curses2keycode[CURSES_KEYS] = {
+static const int curses2keycode[CURSES_KEYS] = {
     [0 ... (CURSES_KEYS - 1)] = -1,
 
     [0x01b] = 1, /* Escape */
@@ -192,7 +196,7 @@ int curses2keycode[CURSES_KEYS] = {
     [0x014] = 20 | CNTRL, /* Control + t */
     [0x019] = 21 | CNTRL, /* Control + y */
     [0x015] = 22 | CNTRL, /* Control + u */
-    [0x009] = 23 | CNTRL, /* Control + i */
+    /* Control + i collides with Tab */
     [0x00f] = 24 | CNTRL, /* Control + o */
     [0x010] = 25 | CNTRL, /* Control + p */
 
@@ -202,7 +206,7 @@ int curses2keycode[CURSES_KEYS] = {
     [0x006] = 33 | CNTRL, /* Control + f */
     [0x007] = 34 | CNTRL, /* Control + g */
     [0x008] = 35 | CNTRL, /* Control + h */
-    [0x00a] = 36 | CNTRL, /* Control + j */
+    /* Control + j collides with Return */
     [0x00b] = 37 | CNTRL, /* Control + k */
     [0x00c] = 38 | CNTRL, /* Control + l */
 
@@ -216,7 +220,7 @@ int curses2keycode[CURSES_KEYS] = {
 
 };
 
-int curses2keysym[CURSES_KEYS] = {
+static const int curses2keysym[CURSES_KEYS] = {
     [0 ... (CURSES_KEYS - 1)] = -1,
 
     ['\n'] = '\n',
@@ -239,12 +243,7 @@ int curses2keysym[CURSES_KEYS] = {
 
 };
 
-typedef struct {
-	const char* name;
-	int keysym;
-} name2keysym_t;
-
-static name2keysym_t name2keysym[] = {
+static const name2keysym_t name2keysym[] = {
     /* Plain ASCII */
     { "space", 0x020 },
     { "exclam", 0x021 },