diff --git a/0077-smbios-Add-1-terminator-if-any-stri.patch b/0077-smbios-Add-1-terminator-if-any-stri.patch index 1e462559..747684e6 100644 --- a/0077-smbios-Add-1-terminator-if-any-stri.patch +++ b/0077-smbios-Add-1-terminator-if-any-stri.patch @@ -1,4 +1,4 @@ -From f49122e7d4af62fa2cb8ab1a7ae8aff67a62a475 Mon Sep 17 00:00:00 2001 +From 2327abe59d36fda675560f955923a638fd1eed0d Mon Sep 17 00:00:00 2001 From: Lin Ma Date: Wed, 14 Mar 2018 14:31:26 +0800 Subject: [PATCH] smbios: Add 1 terminator if any string fields defined in diff --git a/0078-Remove-problematic-evdev-86-key-fro.patch b/0078-Remove-problematic-evdev-86-key-fro.patch new file mode 100644 index 00000000..af9df7f6 --- /dev/null +++ b/0078-Remove-problematic-evdev-86-key-fro.patch @@ -0,0 +1,32 @@ +From 3c263c86795e5c2325ccdc4ac098a37c60eeb8c4 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 20 Dec 2017 15:43:07 -0800 +Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap + +This causes LP#1738283. Gerd will have to come up with a better +fix, but just hacking out the problematic key definition should +work for now. + +[BR: We see this issue as well, eg via vnc] +Signed-off-by: Bruce Rogers +--- + pc-bios/keymaps/en-us | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/pc-bios/keymaps/en-us b/pc-bios/keymaps/en-us +index a70e03adc0..e518a9dc35 100644 +--- a/pc-bios/keymaps/en-us ++++ b/pc-bios/keymaps/en-us +@@ -343,12 +343,6 @@ KP_Decimal 0x53 numlock + + # evdev 85 (0x55): no evdev -> QKeyCode mapping (xkb keysym NoSymbol) + +-# evdev 86 (0x56), QKeyCode "less", number 0x56 +-less 0x56 +-greater 0x56 shift +-bar 0x56 altgr +-brokenbar 0x56 shift altgr +- + # evdev 87 (0x57), QKeyCode "f11", number 0x57 + F11 0x57 + diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 31d617c3..a3e8e9a7 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 14 18:41:50 UTC 2018 - brogers@suse.com + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11 +* Patches added: + 0078-Remove-problematic-evdev-86-key-fro.patch + ------------------------------------------------------------------- Wed Mar 14 06:38:40 UTC 2018 - lma@suse.com diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index dcd612a8..9ebd8c9b 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -19,7 +19,7 @@ Name: qemu-linux-user Url: http://www.qemu.org/ Summary: CPU emulator for user space -License: BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT +License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC Version: 2.11.1 Release: 0 @@ -103,6 +103,7 @@ Patch0074: 0074-cpu-i386-populate-CPUID-0x8000_001F.patch Patch0075: 0075-migration-warn-about-inconsistent-s.patch Patch0076: 0076-smbios-support-setting-OEM-strings-.patch Patch0077: 0077-smbios-Add-1-terminator-if-any-stri.patch +Patch0078: 0078-Remove-problematic-evdev-86-key-fro.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. Source400: update_git.sh @@ -209,6 +210,7 @@ syscall layer occurs on the native hardware and operating system. %patch0075 -p1 %patch0076 -p1 %patch0077 -p1 +%patch0078 -p1 %build ./configure \ diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 59e69fa6..901e7404 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 14 18:41:48 UTC 2018 - brogers@suse.com + +- Fix issue with key codes in qemu v2.11 + 0078-Remove-problematic-evdev-86-key-fro.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11 + ------------------------------------------------------------------- Wed Mar 14 06:38:36 UTC 2018 - lma@suse.com diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 38991633..4e0e2aa4 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -107,7 +107,7 @@ Name: qemu-testsuite Url: http://www.qemu.org/ Summary: Machine emulator and virtualizer -License: BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT +License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC Version: 2.11.1 Release: 0 @@ -207,6 +207,7 @@ Patch0074: 0074-cpu-i386-populate-CPUID-0x8000_001F.patch Patch0075: 0075-migration-warn-about-inconsistent-s.patch Patch0076: 0076-smbios-support-setting-OEM-strings-.patch Patch0077: 0077-smbios-Add-1-terminator-if-any-stri.patch +Patch0078: 0078-Remove-problematic-evdev-86-key-fro.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -883,6 +884,7 @@ This package provides a service file for starting and stopping KSM. %patch0075 -p1 %patch0076 -p1 %patch0077 -p1 +%patch0078 -p1 %if 0%{?suse_version} > 1320 %patch1000 -p1 diff --git a/qemu.changes b/qemu.changes index 59e69fa6..901e7404 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 14 18:41:48 UTC 2018 - brogers@suse.com + +- Fix issue with key codes in qemu v2.11 + 0078-Remove-problematic-evdev-86-key-fro.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11 + ------------------------------------------------------------------- Wed Mar 14 06:38:36 UTC 2018 - lma@suse.com diff --git a/qemu.spec b/qemu.spec index 595202e2..c432adaa 100644 --- a/qemu.spec +++ b/qemu.spec @@ -107,7 +107,7 @@ Name: qemu Url: http://www.qemu.org/ Summary: Machine emulator and virtualizer -License: BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT +License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC Version: 2.11.1 Release: 0 @@ -207,6 +207,7 @@ Patch0074: 0074-cpu-i386-populate-CPUID-0x8000_001F.patch Patch0075: 0075-migration-warn-about-inconsistent-s.patch Patch0076: 0076-smbios-support-setting-OEM-strings-.patch Patch0077: 0077-smbios-Add-1-terminator-if-any-stri.patch +Patch0078: 0078-Remove-problematic-evdev-86-key-fro.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -883,6 +884,7 @@ This package provides a service file for starting and stopping KSM. %patch0075 -p1 %patch0076 -p1 %patch0077 -p1 +%patch0078 -p1 %if 0%{?suse_version} > 1320 %patch1000 -p1 diff --git a/supported.arm.txt b/supported.arm.txt index d7551f2b..62f43ac3 100644 --- a/supported.arm.txt +++ b/supported.arm.txt @@ -716,6 +716,8 @@ QEMU Command-Line and Monitor Syntax and Support nbd-server-add nbd-server-start nbd-server-stop + query-sev + query-sev-launch-measure x-blockdev-change x-blockdev-insert-medium x-blockdev-remove-medium diff --git a/supported.ppc.txt b/supported.ppc.txt index 42eec0de..877e5c68 100644 --- a/supported.ppc.txt +++ b/supported.ppc.txt @@ -654,6 +654,8 @@ QEMU Command-Line and Monitor Syntax and Support nbd-server-add nbd-server-start nbd-server-stop + query-sev + query-sev-launch-measure x-blockdev-change x-blockdev-insert-medium x-blockdev-remove-medium diff --git a/supported.s390.txt b/supported.s390.txt index 274c22f8..9eaada0c 100644 --- a/supported.s390.txt +++ b/supported.s390.txt @@ -679,6 +679,8 @@ QEMU Command-Line and Monitor Syntax and Support nbd-server-add nbd-server-start nbd-server-stop + query-sev + query-sev-launch-measure query-tpm query-tpm-models query-tpm-types diff --git a/supported.x86.txt b/supported.x86.txt index 1325c156..c84b04a2 100644 --- a/supported.x86.txt +++ b/supported.x86.txt @@ -774,6 +774,8 @@ QEMU Command-Line and Monitor Syntax and Support nbd-server-add nbd-server-start nbd-server-stop + query-sev + query-sev-launch-measure x-blockdev-change x-blockdev-insert-medium x-blockdev-remove-medium