Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in
at 2018-06-05 12:49:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Tue Jun 5 12:49:18 2018 rev:141 rq:613355 version:2.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2018-05-29
16:46:35.460367601 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes
2018-06-05 12:49:22.397414851 +0200
@@ -1,0 +2,13 @@
+Thu May 31 19:51:59 UTC 2018 - brog...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.12
+* Patches dropped:
+ 0065-Revert-replay-don-t-process-async-e.patch
+ 0066-Revert-replay-avoid-recursive-call-.patch
+ 0067-Revert-replay-check-return-values-o.patch
+ 0068-Revert-replay-push-replay_mutex_loc.patch
+* Patches added:
+ 0065-ahci-fix-PxCI-register-race.patch
+ 0066-ccid-card-passthru-fix-regression-i.patch
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu-testsuite.changes 2018-05-29
16:46:35.504365982 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-testsuite.changes 2018-06-05
12:49:22.429413679 +0200
@@ -1,0 +2,23 @@
+Thu May 31 19:51:52 UTC 2018 - brog...@suse.com
+
+- Looks like the right fix for the AHCI issue has been identified
+ upstream. Turns out to also affect Linux guests as well.
+ (bsc#1094406)
+* Patches dropped:
+ 0065-Revert-replay-don-t-process-async-e.patch
+ 0066-Revert-replay-avoid-recursive-call-.patch
+ 0067-Revert-replay-check-return-values-o.patch
+ 0068-Revert-replay-push-replay_mutex_loc.patch
+* Patches added:
+ 0065-ahci-fix-PxCI-register-race.patch
+- Fix a regresssion introduced in v2.12.0 for ccid-card-passthrough
+ (bsc#1095419)
+ 0066-ccid-card-passthru-fix-regression-i.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.12
+
+-------------------------------------------------------------------
+Tue May 29 10:44:23 UTC 2018 - l...@suse.com
+
+- Fix qemu-guest-agent service issue (bsc#1094898)
+
+-------------------------------------------------------------------
qemu.changes: same change
Old:
----
0065-Revert-replay-don-t-process-async-e.patch
0066-Revert-replay-avoid-recursive-call-.patch
0067-Revert-replay-check-return-values-o.patch
0068-Revert-replay-push-replay_mutex_loc.patch
New:
----
0065-ahci-fix-PxCI-register-race.patch
0066-ccid-card-passthru-fix-regression-i.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu-linux-user.spec ++++++
--- /var/tmp/diff_new_pack.ybCcYE/_old 2018-06-05 12:49:24.741328964 +0200
+++ /var/tmp/diff_new_pack.ybCcYE/_new 2018-06-05 12:49:24.745328818 +0200
@@ -90,10 +90,8 @@
Patch0062: 0062-i386-define-the-ssbd-CPUID-feature-.patch
Patch0063: 0063-i386-Define-the-Virt-SSBD-MSR-and-h.patch
Patch0064: 0064-i386-define-the-AMD-virt-ssbd-CPUID.patch
-Patch0065: 0065-Revert-replay-don-t-process-async-e.patch
-Patch0066: 0066-Revert-replay-avoid-recursive-call-.patch
-Patch0067: 0067-Revert-replay-check-return-values-o.patch
-Patch0068: 0068-Revert-replay-push-replay_mutex_loc.patch
+Patch0065: 0065-ahci-fix-PxCI-register-race.patch
+Patch0066: 0066-ccid-card-passthru-fix-regression-i.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
Source400: update_git.sh
@@ -193,8 +191,6 @@
%patch0064 -p1
%patch0065 -p1
%patch0066 -p1
-%patch0067 -p1
-%patch0068 -p1
%build
./configure \
++++++ qemu-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.ybCcYE/_old 2018-06-05 12:49:24.777327646 +0200
+++ /var/tmp/diff_new_pack.ybCcYE/_new 2018-06-05 12:49:24.789327206 +0200
@@ -194,10 +194,8 @@
Patch0062: 0062-i386-define-the-ssbd-CPUID-feature-.patch
Patch0063: 0063-i386-Define-the-Virt-SSBD-MSR-and-h.patch
Patch0064: 0064-i386-define-the-AMD-virt-ssbd-CPUID.patch
-Patch0065: 0065-Revert-replay-don-t-process-async-e.patch
-Patch0066: 0066-Revert-replay-avoid-recursive-call-.patch
-Patch0067: 0067-Revert-replay-check-return-values-o.patch
-Patch0068: 0068-Revert-replay-push-replay_mutex_loc.patch
+Patch0065: 0065-ahci-fix-PxCI-register-race.patch
+Patch0066: 0066-ccid-card-passthru-fix-regression-i.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@@ -932,8 +930,6 @@
%patch0064 -p1
%patch0065 -p1
%patch0066 -p1
-%patch0067 -p1
-%patch0068 -p1
%if 0%{?suse_version} > 1320
%patch1000 -p1
qemu.spec: same change
++++++ 0065-ahci-fix-PxCI-register-race.patch ++++++
>From e0efecf6cb09ed306c6082949f0ce92f23439c71 Mon Sep 17 00:00:00 2001
From: John Snow <js...@redhat.com>
Date: Thu, 31 May 2018 04:16:16 -0600
Subject: [PATCH] ahci: fix PxCI register race
AHCI presently signals completion prior to the PxCI register being
cleared to indicate completion. If a guest driver attempts to issue
a new command in its IRQ handler, it might be surprised to learn there
is still a command pending.
In the case of Windows 10's boot driver, it will actually poll the IRQ
register hoping to find out when the command is done running -- which
will never happen, as there isn't a command running.
Fix this: clear PxCI in ahci_cmd_done and not in the asynchronous BH.
Because it now runs synchronously, we don't need to check if the command
is actually done by spying on the ATA registers. We know it's done.
Signed-off-by: John Snow <js...@redhat.com>
[BR: BSC#1094406]
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
hw/ide/ahci.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index e22d7be05f..18b9a9c18b 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -532,13 +532,6 @@ static void ahci_check_cmd_bh(void *opaque)
qemu_bh_delete(ad->check_bh);
ad->check_bh = NULL;
- if ((ad->busy_slot != -1) &&
- !(ad->port.ifs[0].status & (BUSY_STAT|DRQ_STAT))) {
- /* no longer busy */
- ad->port_regs.cmd_issue &= ~(1 << ad->busy_slot);
- ad->busy_slot = -1;
- }
-
check_cmd(ad->hba, ad->port_no);
}
@@ -1425,6 +1418,12 @@ static void ahci_cmd_done(IDEDMA *dma)
trace_ahci_cmd_done(ad->hba, ad->port_no);
+ /* no longer busy */
+ if (ad->busy_slot != -1) {
+ ad->port_regs.cmd_issue &= ~(1 << ad->busy_slot);
+ ad->busy_slot = -1;
+ }
+
/* update d2h status */
ahci_write_fis_d2h(ad);
++++++ 0066-ccid-card-passthru-fix-regression-i.patch ++++++
>From 69a3175c82f1a8453e021d19a5ddd362e8c4fb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lur...@redhat.com>
Date: Tue, 15 May 2018 17:30:39 +0200
Subject: [PATCH] ccid-card-passthru: fix regression in realize()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Since cc847bfd16d894fd8c1a2ce25f31772f6cdbbc74, CCID card-passthru
fails to intialize, because it changed a debug line to an error,
probably by mistake. Change it back to a DPRINTF debug.
(solves Boxes creating VM with smartcard passthru failing to start)
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Message-id: 20180515153039.27514-1-marcandre.lur...@redhat.com
Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
(cherry picked from commit e58d64a16abc2304c4dcb644411eb9580bf63b1e)
[BR: BSC#1095419]
Signed-off-by: Bruce Rogers <brog...@suse.com>
---
hw/usb/ccid-card-passthru.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index b7dd3602dc..668a22d2da 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -345,7 +345,7 @@ static void passthru_realize(CCIDCardState *base, Error
**errp)
card->vscard_in_pos = 0;
card->vscard_in_hdr = 0;
if (qemu_chr_fe_backend_connected(&card->cs)) {
- error_setg(errp, "ccid-card-passthru: initing chardev");
+ DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev");
qemu_chr_fe_set_handlers(&card->cs,
ccid_card_vscard_can_read,
ccid_card_vscard_read,
++++++ 80-qemu-ga.rules ++++++
--- /var/tmp/diff_new_pack.ybCcYE/_old 2018-06-05 12:49:25.201312109 +0200
+++ /var/tmp/diff_new_pack.ybCcYE/_new 2018-06-05 12:49:25.205311963 +0200
@@ -1 +1 @@
-SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0",
TAG+="systemd",
ENV{SYSTEMD_WANTS}+="qemu-ga@virtio\x2dports-org.qemu.guest_agent.0.service"
+SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0",
TAG+="systemd",
ENV{SYSTEMD_WANTS}+="qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service"
