Accepting request 506218 from home:bfrogers:branches:Virtualization

Fix for issue which affects openQA

OBS-URL: https://build.opensuse.org/request/show/506218
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=346

0056-jazz_led-fix-bad-snprintf.patch

@@ -1,4 +1,4 @@
-From 5369a4b1932f7c298ae360789fd182c24e14c569 Mon Sep 17 00:00:00 2001
+From 93971b136370f4d22269a605a2d1d60cb0fa185a Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Wed, 3 May 2017 12:44:41 +0200
 Subject: [PATCH] jazz_led: fix bad snprintf

0057-slirp-smb-Replace-constant-strings-.patch

@@ -1,4 +1,4 @@
-From 94cc81bb7e1655b2b8ce0f1c996877ffb156bfb2 Mon Sep 17 00:00:00 2001
+From 40a4715c9e38f67f30bb22565d7e2b1cc59b7832 Mon Sep 17 00:00:00 2001
 From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
 Date: Fri, 7 Apr 2017 15:32:54 +0100
 Subject: [PATCH] slirp/smb: Replace constant strings by glib string

0058-altera_timer-fix-incorrect-memset.patch

@@ -1,4 +1,4 @@
-From 355047e16c0834b88d7df8ef86efef8b0d3b6adc Mon Sep 17 00:00:00 2001
+From ac31e9efbe92ee16903a446db4faa14f28e8a9b8 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Mon, 22 May 2017 17:46:40 -0600
 Subject: [PATCH] altera_timer: fix incorrect memset

0059-Hacks-for-building-on-gcc-7-Fedora-.patch

@@ -1,4 +1,4 @@
-From 694037b618e2d331c38c287857da993fdab1f011 Mon Sep 17 00:00:00 2001
+From f73df04319a21d9c40ae7b40614637f2fbd5fa3f Mon Sep 17 00:00:00 2001
 From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
 Date: Mon, 22 May 2017 17:48:13 -0600
 Subject: [PATCH] Hacks for building on gcc 7 / Fedora 26

0060-9pfs-local-fix-unlink-of-alien-file.patch

@@ -1,4 +1,4 @@
-From 85bc346e1f5d90e1be7147f982e18511304daaeb Mon Sep 17 00:00:00 2001
+From 44e4ce741c71d1d2c32f1d2b0d90a1f2e635e44f Mon Sep 17 00:00:00 2001
 From: Greg Kurz <groug@kaod.org>
 Date: Thu, 25 May 2017 10:30:13 +0200
 Subject: [PATCH] 9pfs: local: fix unlink of alien files in mapped-file mode

0061-megasas-do-not-read-DCMD-opcode-mor.patch

@@ -1,4 +1,4 @@
-From e0653c80373f056fa0bd72fb9aef161dac13b1cf Mon Sep 17 00:00:00 2001
+From b4c6e40036a569fa10cd2fde63244e707b4d75e5 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Mon, 19 Jun 2017 16:36:08 -0600
 Subject: [PATCH] megasas: do not read DCMD opcode more than once from frame

0062-megasas-always-store-SCSIRequest-in.patch

@@ -1,4 +1,4 @@
-From 0199dd521a16bff213ee66fe1fb257790006237f Mon Sep 17 00:00:00 2001
+From 5e011980d6a696192ce807c21c145d738668d040 Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Sat, 10 Jun 2017 14:04:51 -0600
 Subject: [PATCH] megasas: always store SCSIRequest* into MegasasCmd

0063-nbd-Fully-initialize-client-in-case.patch

@@ -1,4 +1,4 @@
-From 94301dd6735f540dc9f6e01943fda914c4bbef8a Mon Sep 17 00:00:00 2001
+From 096703b0e4c619c6cd3015fcb105c65692b2ec56 Mon Sep 17 00:00:00 2001
 From: Eric Blake <eblake@redhat.com>
 Date: Fri, 26 May 2017 22:04:21 -0500
 Subject: [PATCH] nbd: Fully initialize client in case of failed negotiation

0064-9pfs-local-remove-use-correct-path-.patch

@@ -1,4 +1,4 @@
-From d8ebbbc6a85bc9a6a6e194564719e43a51ec2e86 Mon Sep 17 00:00:00 2001
+From e915b08f89ee946a702b98624c1e73849ddb611c Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Mon, 19 Jun 2017 14:48:02 -0600
 Subject: [PATCH] 9pfs: local: remove: use correct path component

0065-hid-Reset-kbd-modifiers-on-reset.patch

@@ -0,0 +1,27 @@
+From b1fafc01f55733b0e1aaeba84192b6515c92f7a0 Mon Sep 17 00:00:00 2001
+From: Alexander Graf <agraf@suse.de>
+Date: Thu, 22 Jun 2017 09:33:21 +0200
+Subject: [PATCH] hid: Reset kbd modifiers on reset
+
+When resetting the keyboard, we need to reset not just the pending keystrokes,
+but also any pending modifiers. Otherwise there's a race when we're getting
+reset while running an escape sequence (modifier 0x100).
+
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ hw/input/hid.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/input/hid.c b/hw/input/hid.c
+index 93887ecc43..0d049ff61c 100644
+--- a/hw/input/hid.c
++++ b/hw/input/hid.c
+@@ -487,6 +487,7 @@ void hid_reset(HIDState *hs)
+         memset(hs->kbd.keycodes, 0, sizeof(hs->kbd.keycodes));
+         memset(hs->kbd.key, 0, sizeof(hs->kbd.key));
+         hs->kbd.keys = 0;
++        hs->kbd.modifiers = 0;
+         break;
+     case HID_MOUSE:
+     case HID_TABLET:

0066-input-Decrement-queue-count-on-kbd-.patch

@@ -0,0 +1,29 @@
+From bea345d1c1fa6d351de7cacf66ccc35845406b31 Mon Sep 17 00:00:00 2001
+From: Alexander Graf <agraf@suse.de>
+Date: Thu, 22 Jun 2017 09:36:36 +0200
+Subject: [PATCH] input: Decrement queue count on kbd delay
+
+Delays in the input layer are special cased input events. Every input
+event is accounted for in a global intput queue count. The special cased
+delays however did not get removed from the queue, leading to queue overruns
+and thus silent key drops after typing quite a few characters.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+Fixes: be1a7176 ("input: add support for kbd delays")
+Cc: qemu-stable@nongnu.org
+---
+ ui/input.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ui/input.c b/ui/input.c
+index fb1f404095..94ba3d52cf 100644
+--- a/ui/input.c
++++ b/ui/input.c
+@@ -252,6 +252,7 @@ static void qemu_input_queue_process(void *opaque)
+     item = QTAILQ_FIRST(queue);
+     g_assert(item->type == QEMU_INPUT_QUEUE_DELAY);
+     QTAILQ_REMOVE(queue, item, node);
++    queue_count--;
+     g_free(item);
+ 
+     while (!QTAILQ_EMPTY(queue)) {

qemu-linux-user.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 26 08:51:24 UTC 2017 - brogers@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9
+* Patches added:
+  0065-hid-Reset-kbd-modifiers-on-reset.patch
+  0066-input-Decrement-queue-count-on-kbd-.patch
+
 -------------------------------------------------------------------
 Tue Jun 20 14:14:17 UTC 2017 - brogers@suse.com
 

qemu-linux-user.spec

@@ -90,6 +90,8 @@ Patch0061:      0061-megasas-do-not-read-DCMD-opcode-mor.patch
 Patch0062:      0062-megasas-always-store-SCSIRequest-in.patch
 Patch0063:      0063-nbd-Fully-initialize-client-in-case.patch
 Patch0064:      0064-9pfs-local-remove-use-correct-path-.patch
+Patch0065:      0065-hid-Reset-kbd-modifiers-on-reset.patch
+Patch0066:      0066-input-Decrement-queue-count-on-kbd-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 Source400:      update_git.sh
@@ -207,6 +209,8 @@ run cross-architecture builds.
 %patch0062 -p1
 %patch0063 -p1
 %patch0064 -p1
+%patch0065 -p1
+%patch0066 -p1
 
 %build
 ./configure \

qemu-testsuite.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 26 08:51:21 UTC 2017 - brogers@suse.com
+
+- Fixed stuck state during usb keyboard reset (bsc#1044936)
+  0065-hid-Reset-kbd-modifiers-on-reset.patch
+- Fixed keyboard events getting lost (bsc#1044936)
+  0066-input-Decrement-queue-count-on-kbd-.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9
+
 -------------------------------------------------------------------
 Tue Jun 20 14:14:14 UTC 2017 - brogers@suse.com
 

qemu-testsuite.spec

@@ -194,6 +194,8 @@ Patch0061:      0061-megasas-do-not-read-DCMD-opcode-mor.patch
 Patch0062:      0062-megasas-always-store-SCSIRequest-in.patch
 Patch0063:      0063-nbd-Fully-initialize-client-in-case.patch
 Patch0064:      0064-9pfs-local-remove-use-correct-path-.patch
+Patch0065:      0065-hid-Reset-kbd-modifiers-on-reset.patch
+Patch0066:      0066-input-Decrement-queue-count-on-kbd-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -909,6 +911,8 @@ This package provides a service file for starting and stopping KSM.
 %patch0062 -p1
 %patch0063 -p1
 %patch0064 -p1
+%patch0065 -p1
+%patch0066 -p1
 
 pushd roms/ipxe
 %patch1100 -p1

qemu.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 26 08:51:21 UTC 2017 - brogers@suse.com
+
+- Fixed stuck state during usb keyboard reset (bsc#1044936)
+  0065-hid-Reset-kbd-modifiers-on-reset.patch
+- Fixed keyboard events getting lost (bsc#1044936)
+  0066-input-Decrement-queue-count-on-kbd-.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9
+
 -------------------------------------------------------------------
 Tue Jun 20 14:14:14 UTC 2017 - brogers@suse.com
 

qemu.spec

@@ -194,6 +194,8 @@ Patch0061:      0061-megasas-do-not-read-DCMD-opcode-mor.patch
 Patch0062:      0062-megasas-always-store-SCSIRequest-in.patch
 Patch0063:      0063-nbd-Fully-initialize-client-in-case.patch
 Patch0064:      0064-9pfs-local-remove-use-correct-path-.patch
+Patch0065:      0065-hid-Reset-kbd-modifiers-on-reset.patch
+Patch0066:      0066-input-Decrement-queue-count-on-kbd-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -909,6 +911,8 @@ This package provides a service file for starting and stopping KSM.
 %patch0062 -p1
 %patch0063 -p1
 %patch0064 -p1
+%patch0065 -p1
+%patch0066 -p1
 
 pushd roms/ipxe
 %patch1100 -p1