From f38f7a847e316def8606d25441878d723de84b65 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 5 Feb 2013 13:12:43 +0100 Subject: [PATCH 1/2] target-m68k: Fix comment * spelling fix ito -> into * reorder to match load/store Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- target-m68k/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index e763195f86..3f1478cc20 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -574,7 +574,7 @@ static inline TCGv gen_ea_once(CPUM68KState *env, DisasContext *s, return gen_ldst(s, opsize, tmp, val, what); } -/* Generate code to load/store a value ito/from an EA. If VAL > 0 this is +/* Generate code to load/store a value from/into an EA. If VAL > 0 this is a write otherwise it is a read (0 == sign extend, -1 == zero extend). ADDRP is non-null for readwrite operands. */ static TCGv gen_ea(CPUM68KState *env, DisasContext *s, uint16_t insn, From 2a0e1ad66e4177dddc6c8fb7aeadc095aafac828 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Mon, 4 Feb 2013 00:36:25 +0400 Subject: [PATCH 2/2] vnc: recognize Hungarian doubleacutes As reported in http://bugs.debian.org/697641 , some Hungarian keys does not work with qemu when using vnc display. This is because while the Hungarian keymap mentions these symbols, qemu know nothing about them. So add them. This patch is applicable to -stable for all previous releases. Signed-off-by: Michael Tokarev Reviewed-by: Laszlo Ersek Signed-off-by: Stefan Hajnoczi --- ui/vnc_keysym.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/vnc_keysym.h b/ui/vnc_keysym.h index df33cfe53c..6250bec692 100644 --- a/ui/vnc_keysym.h +++ b/ui/vnc_keysym.h @@ -215,10 +215,14 @@ static const name2keysym_t name2keysym[]={ { "Zabovedot", 0x1af}, { "zacute", 0x1bc}, { "Zacute", 0x1ac}, +{ "Odoubleacute", 0x1d5}, +{ "Udoubleacute", 0x1db}, { "cacute", 0x1e6}, { "Cacute", 0x1c6}, { "nacute", 0x1f1}, { "Nacute", 0x1d1}, +{ "odoubleacute", 0x1f5}, +{ "udoubleacute", 0x1fb}, /* modifiers */ {"ISO_Level3_Shift", 0xfe03}, /* XK_ISO_Level3_Shift */