Commit 4c98c7b0 authored by Michael Tokarev's avatar Michael Tokarev Committed by Jonas Smedegaard
Browse files

Import Debian changes 1:2.12+dfsg-3

qemu (1:2.12+dfsg-3) unstable; urgency=medium

  * make qemu-system-foo depending
    on qemu-system-data >>ver~, not >>ver
    (Closes: #900585)
  * do not build qemu-system-gui on hppa
  * use dh_lintian for lintian overrides
  * update VCS fields to point to salsa.debian.org

qemu (1:2.12+dfsg-2) unstable; urgency=medium

  * create new package, qemu-system-gui,
    and package GTK module and audio modules in there
    Closes: #850584
  * add an item about qemu-system-gui to debian/qemu-system-common.NEWS
  * qemu-system-*: require more recent qemu-system-common
  * switch all builds to be in a single b/ subdir
  * d/get-orig-source: remove .oco (object) files from roms/SLOF/
  * refresh patches/use-fixed-data-path.patch: remove now-unused local var too
  * ccid-card-passthru-fix-regression-in-realize.patch (Closes: #900006)
  * debian/control-in: enable seccomp on linux-any (Closes: #900055)
  * create new arch-indep package qemu-system-data, for data and firmware files.
    Move common data files from qemu-system-common to it, for now
  * fix sata/ahci stalls (ahci-fix-PxCI-register-race.patch)
  * tcg-i386-Fix-dup_vec-in-non-AVX2-codepath.patch (Closes: #900372)
parent 012fa794
qemu (1:2.12+dfsg-3) unstable; urgency=medium
* make qemu-system-foo depending
on qemu-system-data >>ver~, not >>ver
(Closes: #900585)
* do not build qemu-system-gui on hppa
* use dh_lintian for lintian overrides
* update VCS fields to point to salsa.debian.org
-- Michael Tokarev <mjt@tls.msk.ru> Fri, 01 Jun 2018 21:42:29 +0300
qemu (1:2.12+dfsg-2) unstable; urgency=medium
* create new package, qemu-system-gui,
and package GTK module and audio modules in there
Closes: #850584
* add an item about qemu-system-gui to debian/qemu-system-common.NEWS
* qemu-system-*: require more recent qemu-system-common
* switch all builds to be in a single b/ subdir
* d/get-orig-source: remove .oco (object) files from roms/SLOF/
* refresh patches/use-fixed-data-path.patch: remove now-unused local var too
* ccid-card-passthru-fix-regression-in-realize.patch (Closes: #900006)
* debian/control-in: enable seccomp on linux-any (Closes: #900055)
* create new arch-indep package qemu-system-data, for data and firmware files.
Move common data files from qemu-system-common to it, for now
* fix sata/ahci stalls (ahci-fix-PxCI-register-race.patch)
* tcg-i386-Fix-dup_vec-in-non-AVX2-codepath.patch (Closes: #900372)
-- Michael Tokarev <mjt@tls.msk.ru> Thu, 31 May 2018 13:22:55 +0300
qemu (1:2.12+dfsg-1) unstable; urgency=medium
* new upstream release
......
......@@ -64,8 +64,8 @@ Build-Depends: debhelper (>= 9),
libsasl2-dev,
# --disable-sdl --with-sdlabi=2.0
# libsdl1.2-dev,
# --enable-seccomp linux-amd64|linux-i386|linux-ppc64el
libseccomp-dev (>= 2.3.0) [linux-amd64 linux-i386 linux-ppc64el],
# --enable-seccomp linux-*
libseccomp-dev (>= 2.3.0) [linux-any],
# --enable-spice linux-amd64|linux-i386
libspice-server-dev (>= 0.12.2~) [linux-amd64 linux-i386],
libspice-protocol-dev (>= 0.12.3~) [linux-amd64 linux-i386],
......@@ -102,8 +102,8 @@ Build-Depends: debhelper (>= 9),
Build-Conflicts: oss4-dev
Standards-Version: 3.9.8
Homepage: http://www.qemu.org/
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-qemu/qemu.git
Vcs-Git: git://anonscm.debian.org/pkg-qemu/qemu.git
Vcs-Browser: https://salsa.debian.org/qemu-team/qemu
Vcs-Git: git@salsa.debian.org:qemu-team/qemu.git
Package: qemu
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
......@@ -161,6 +161,17 @@ Description: extra block backend modules for qemu-system and qemu-utils
emulation and qemu-img from qemu-utils package, which are rarely used and
has extra dependencies.
Package: qemu-system-data
Architecture: all
Multi-Arch: allowed
Replaces: qemu-system-common (<< 1:2.12+dfsg-2~)
Conflicts: qemu-system-common (<< 1:2.12+dfsg-2~)
Depends: ${misc:Depends}
Description: QEMU full system emulation (data files)
This package provides architecture-neutral data files
(such as keyboard definitions, icons) for system-mode
QEMU emulation (qemu-system-*) packages.
Package: qemu-system-common
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
......@@ -177,11 +188,19 @@ Description: QEMU full system emulation binaries (common files)
This package provides common files needed for target-specific
full system emulation (qemu-system-*) packages.
Package: qemu-system-gui
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends},
Description: QEMU full system emulation binaries (user interface and audio support)
This package provides local graphical user interface (currently GTK)
and audio backends for full system emulation (qemu-system-*) packages.
Package: qemu-system-misc
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~)
Recommends: qemu-utils,
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# alpha uses vgabios
# alpha m68k sh4 uses bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
......@@ -206,8 +225,8 @@ Description: QEMU full system emulation binaries (miscellaneous)
Package: qemu-system-arm
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~)
Recommends: qemu-utils,
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# aarch64 arm uses bootroms
ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~),
qemu-efi
......@@ -229,8 +248,8 @@ Description: QEMU full system emulation binaries (arm)
Package: qemu-system-mips
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~)
Recommends: qemu-utils,
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# all mips targets uses vgabios and bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
......@@ -251,12 +270,12 @@ Description: QEMU full system emulation binaries (mips)
Package: qemu-system-ppc
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~),
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
qemu-slof,
# ubuntu can't Depend on openbios-ppc and openhackware as they're in universe
openbios-ppc (>= 1.1+svn1229), openhackware
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
Recommends: qemu-utils,
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# ppc targets use vgabios-stdvga and bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Provides: ${sysprovides:ppc}
......@@ -276,10 +295,10 @@ Description: QEMU full system emulation binaries (ppc)
Package: qemu-system-sparc
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~),
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
# ubuntu/openbios-sparc is in universe
openbios-sparc (>> 1.1+svn1395-1~)
Recommends: qemu-utils,
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# sparc64 uses vgabios-stdvga and bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
......@@ -300,9 +319,9 @@ Description: QEMU full system emulation binaries (sparc)
Package: qemu-system-x86
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~),
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
seabios (>= 1.10.2-1~), ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Recommends: qemu-utils,
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
sgabios, ovmf
Provides: ${sysprovides:x86}
......
......@@ -65,8 +65,8 @@ Build-Depends: debhelper (>= 9),
libsasl2-dev,
# --disable-sdl --with-sdlabi=2.0
# libsdl1.2-dev,
# --enable-seccomp linux-amd64|linux-i386|linux-ppc64el
libseccomp-dev (>= 2.3.0) [linux-amd64 linux-i386 linux-ppc64el],
# --enable-seccomp linux-*
libseccomp-dev (>= 2.3.0) [linux-any],
# --enable-spice linux-amd64|linux-i386
libspice-server-dev (>= 0.12.2~) [linux-amd64 linux-i386],
libspice-protocol-dev (>= 0.12.3~) [linux-amd64 linux-i386],
......@@ -103,12 +103,12 @@ Build-Depends: debhelper (>= 9),
Build-Conflicts: oss4-dev
Standards-Version: 3.9.8
Homepage: http://www.qemu.org/
:debian:Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-qemu/qemu.git
:ubuntu:Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-qemu/qemu.git;a=shortlog;h=refs/heads/ubuntu-utopic
:ubuntu:XS-Debian-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-qemu/qemu.git
:debian:Vcs-Git: git://anonscm.debian.org/pkg-qemu/qemu.git
:ubuntu:Vcs-Git: git://anonscm.debian.org/pkg-qemu/qemu.git -b ubuntu-utopic
:ubuntu:XS-Debian-Vcs-Git: git://anonscm.debian.org/pkg-qemu/qemu.git
:debian:Vcs-Browser: https://salsa.debian.org/qemu-team/qemu
:ubuntu:Vcs-Browser: https://salsa.debian.org/qemu-team/qemu/commits/ubuntu-utopic
:ubuntu:XS-Debian-Vcs-Browser: https://salsa.debian.org/qemu-team/qemu
:debian:Vcs-Git: git@salsa.debian.org:qemu-team/qemu.git
:ubuntu:Vcs-Git: git@salsa.debian.org:qemu-team/qemu.git -b ubuntu-utopic
:ubuntu:XS-Debian-Vcs-Git: git@salsa.debian.org:qemu-team/qemu.git
Package: qemu
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
......@@ -166,6 +166,17 @@ Description: extra block backend modules for qemu-system and qemu-utils
emulation and qemu-img from qemu-utils package, which are rarely used and
has extra dependencies.
Package: qemu-system-data
Architecture: all
Multi-Arch: allowed
Replaces: qemu-system-common (<< 1:2.12+dfsg-2~)
Conflicts: qemu-system-common (<< 1:2.12+dfsg-2~)
Depends: ${misc:Depends}
Description: QEMU full system emulation (data files)
This package provides architecture-neutral data files
(such as keyboard definitions, icons) for system-mode
QEMU emulation (qemu-system-*) packages.
Package: qemu-system-common
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
......@@ -183,11 +194,19 @@ Description: QEMU full system emulation binaries (common files)
This package provides common files needed for target-specific
full system emulation (qemu-system-*) packages.
Package: qemu-system-gui
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends},
Description: QEMU full system emulation binaries (user interface and audio support)
This package provides local graphical user interface (currently GTK)
and audio backends for full system emulation (qemu-system-*) packages.
Package: qemu-system-misc
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~)
Recommends: qemu-utils,
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# alpha uses vgabios
# alpha m68k sh4 uses bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
......@@ -212,8 +231,8 @@ Description: QEMU full system emulation binaries (miscellaneous)
Package: qemu-system-arm
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~)
Recommends: qemu-utils,
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# aarch64 arm uses bootroms
ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~),
:debian: qemu-efi
......@@ -236,8 +255,8 @@ Description: QEMU full system emulation binaries (arm)
Package: qemu-system-mips
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~)
Recommends: qemu-utils,
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# all mips targets uses vgabios and bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
......@@ -258,13 +277,13 @@ Description: QEMU full system emulation binaries (mips)
Package: qemu-system-ppc
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~),
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
qemu-slof,
# ubuntu can't Depend on openbios-ppc and openhackware as they're in universe
:debian: openbios-ppc (>= 1.1+svn1229), openhackware
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
:ubuntu: openbios-ppc (>= 1.1+svn1229), openhackware
Recommends: qemu-utils,
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# ppc targets use vgabios-stdvga and bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Provides: ${sysprovides:ppc}
......@@ -284,10 +303,10 @@ Description: QEMU full system emulation binaries (ppc)
Package: qemu-system-sparc
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~),
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
# ubuntu/openbios-sparc is in universe
:debian: openbios-sparc (>> 1.1+svn1395-1~)
Recommends: qemu-utils,
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
# sparc64 uses vgabios-stdvga and bootroms
seabios, ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
......@@ -309,9 +328,9 @@ Description: QEMU full system emulation binaries (sparc)
Package: qemu-system-x86
Architecture: amd64 arm arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64 x32
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~),
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 1:2.12~), qemu-system-data (>> ${source:Version}~),
seabios (>= 1.10.2-1~), ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Recommends: qemu-utils,
Recommends: qemu-system-gui (= ${binary:Version}), qemu-utils,
:ubuntu: cpu-checker
Suggests: samba, vde2, qemu-block-extra (= ${binary:Version}),
sgabios, ovmf
......
......@@ -51,6 +51,10 @@ rm -vf pc-bios/qemu_vga.ndrv # roms/QemuMacDrivers/
#dir roms/seabios-hppa
#dir roms/sgabios
#dir roms/SLOF
rm -vf roms/SLOF/board-js2x/rtas/i2c_bmc.oco
rm -vf roms/SLOF/board-js2x/rtas/ipmi_oem.oco
rm -vf roms/SLOF/clients/takeover/takeover.oco
rm -vf roms/SLOF/lib/libipmi/libipmi.oco
#dir roms/skiboot
#dir roms/vgabios
#dir roms/u-boot
......
From: John Snow <jsnow@redhat.com>
Date: Wed, 30 May 2018 20:43:22 -0400
Subject: 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 <jsnow@redhat.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);
--
2.11.0
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@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
Commit-Id: e58d64a16abc2304c4dcb644411eb9580bf63b1e
Bug-Debian: http://bugs.debian.org/900006
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.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180515153039.27514-1-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.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 7684db0cb3..25fb19b0d7 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,
--
2.11.0
use-fixed-data-path.patch
ccid-card-passthru-fix-regression-in-realize.patch
ahci-fix-PxCI-register-race.patch
tcg-i386-Fix-dup_vec-in-non-AVX2-codepath.patch
From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 4 May 2018 16:34:31 +0100
Subject: tcg/i386: Fix dup_vec in non-AVX2 codepath
Commit-Id: 7eb30ef0ba2eb59e7430d4848ae8d4bf4e50f768
Bug-Debian: http://bugs.debian.org/900372
The VPUNPCKLD* instructions are all "non-destructive source",
indicated by "NDS" in the encoding string in the x86 ISA manual.
This means that they take two source operands, one of which is
encoded in the VEX.vvvv field. We were incorrectly treating them
as if they were destructive-source and passing 0 as the 'v'
argument of tcg_out_vex_modrm(). This meant we were always
using %xmm0 as one of the source operands, causing incorrect
results if the register allocator happened to want to use
something else. For instance the input AArch64 insn:
DUP v26.16b, w21
which becomes TCG IR ops:
dup_vec v128,e8,tmp2,x21
st_vec v128,e8,tmp2,env,$0xa40
was assembled to:
0x607c568c: c4 c1 7a 7e 86 e8 00 00 vmovq 0xe8(%r14), %xmm0
0x607c5694: 00
0x607c5695: c5 f9 60 c8 vpunpcklbw %xmm0, %xmm0, %xmm1
0x607c5699: c5 f9 61 c9 vpunpcklwd %xmm1, %xmm0, %xmm1
0x607c569d: c5 f9 70 c9 00 vpshufd $0, %xmm1, %xmm1
0x607c56a2: c4 c1 7a 7f 8e 40 0a 00 vmovdqu %xmm1, 0xa40(%r14)
0x607c56aa: 00
when the vpunpcklwd insn should be "%xmm1, %xmm1, %xmm1".
This resulted in our incorrectly setting the output vector to
q26=0000320000003200:0000320000003200
when given an input of x21 == 0000000002803200
rather than the expected all-zeroes.
Pass the correct source register number to tcg_out_vex_modrm()
for these insns.
Fixes: 770c2fc7bb70804a
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20180504153431.5169-1-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/i386/tcg-target.inc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
index d7e59e79c5..5357909fff 100644
--- a/tcg/i386/tcg-target.inc.c
+++ b/tcg/i386/tcg-target.inc.c
@@ -854,11 +854,11 @@ static void tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned vece,
switch (vece) {
case MO_8:
/* ??? With zero in a register, use PSHUFB. */
- tcg_out_vex_modrm(s, OPC_PUNPCKLBW, r, 0, a);
+ tcg_out_vex_modrm(s, OPC_PUNPCKLBW, r, a, a);
a = r;
/* FALLTHRU */
case MO_16:
- tcg_out_vex_modrm(s, OPC_PUNPCKLWD, r, 0, a);
+ tcg_out_vex_modrm(s, OPC_PUNPCKLWD, r, a, a);
a = r;
/* FALLTHRU */
case MO_32:
@@ -867,7 +867,7 @@ static void tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_out8(s, 0);
break;
case MO_64:
- tcg_out_vex_modrm(s, OPC_PUNPCKLQDQ, r, 0, a);
+ tcg_out_vex_modrm(s, OPC_PUNPCKLQDQ, r, a, a);
break;
default:
g_assert_not_reached();
--
2.11.0
......@@ -27,16 +27,24 @@ and it will still work.
{
--- a/vl.c
+++ b/vl.c
@@ -4171,9 +4171,9 @@ int main(int argc, char **argv, char **e
@@ -3051,7 +3051,7 @@ int main(int argc, char **argv, char **e
Error *main_loop_err = NULL;
Error *err = NULL;
bool list_data_dirs = false;
- char *dir, **dirs;
+ char **dirs;
typedef struct BlockdevOptions_queue {
BlockdevOptions *bdo;
Location loc;
@@ -4170,11 +4170,6 @@ int main(int argc, char **argv, char **e
}
g_strfreev(dirs);
/* try to find datadir relative to the executable path */
- /* try to find datadir relative to the executable path */
- dir = os_find_datadir();
- qemu_add_data_dir(dir);
- g_free(dir);
+// dir = os_find_datadir();
+// qemu_add_data_dir(dir);
+// g_free(dir);
-
/* add the datadir specified when building */
qemu_add_data_dir(CONFIG_QEMU_DATADIR);
qemu (1:2.12+dfsg-2) unstable; urgency=medium
Since qemu 2.12, [G]UI display frontends can be built as modules.
Debian creates new package, qemu-system-gui, which currently
includes GTK3 support. This also switches display from SDL to GTK.
Qemu-system-* packages recommends installing qemu-system-gui, so
by default on upgrade you will have new package installed, and
local GUI will continue to work. However, if you choose to not
install recommended packages, you might consider installing
qemu-system-gui package separately, if you need local GUI support
as well. Without this package, qemu-system-* becomes "headless",
and can be used on servers to reduce amount of dependencies -
this way, no X11 stuff is needed by qemu-system anymore.
-- Michael Tokarev <mjt@tls.msk.ru> Sun, 27 Apr 2018 09:18:32 +0300
qemu (1:2.2+dfsg-6exp) unstable; urgency=medium
Since Debian release 2.2+dfsg-6exp, a new package named qemu-block-extra
......
debian/qemu-ifdown etc/
debian/tmp/usr/share/man/man1/qemu-system.1
debian/tmp/usr/share/qemu/keymaps
debian/tmp/usr/share/qemu/trace-events-all
pc-bios/qemu-icon.bmp usr/share/qemu
pc-bios/qemu_logo_no_text.svg usr/share/qemu
debian/tmp/usr/share/man/man7/qemu-qmp-ref.7
debian/tmp/usr/share/man/man7/qemu-block-drivers.7
debian/tmp/usr/share/doc/qemu/qemu-doc.* usr/share/doc/qemu-system-common
debian/tmp/usr/share/doc/qemu/qemu-qmp-ref.* usr/share/doc/qemu-system-common
debian/tmp/usr/share/locale/*/LC_MESSAGES/qemu.mo
......@@ -8,5 +8,5 @@ Abstract: The QEMU user manual intends to make the user understand what
Section: Emulators
Format: HTML
Index: /usr/share/doc/qemu-system-common/qemu-doc.html
Files: /usr/share/doc/qemu-system-common/qemu-doc.html
Index: /usr/share/doc/qemu-system-data/qemu-doc.html
Files: /usr/share/doc/qemu-system-data/qemu-doc.html
debian/tmp/usr/share/man/man1/qemu-system.1
debian/tmp/usr/share/qemu/keymaps
debian/tmp/usr/share/qemu/trace-events-all
pc-bios/qemu-icon.bmp usr/share/qemu
pc-bios/qemu_logo_no_text.svg usr/share/qemu
debian/tmp/usr/share/man/man7/qemu-qmp-ref.7
debian/tmp/usr/share/man/man7/qemu-block-drivers.7
debian/tmp/usr/share/doc/qemu/qemu-doc.* usr/share/doc/qemu-system-data
debian/tmp/usr/share/doc/qemu/qemu-qmp-ref.* usr/share/doc/qemu-system-data
usr/lib/*/qemu/ui-gtk.so
usr/lib/*/qemu/audio-*.so
usr/share/locale/*/LC_MESSAGES/qemu.mo
qemu-build/pc-bios/bamboo.dtb usr/share/qemu/
b/qemu/pc-bios/bamboo.dtb usr/share/qemu/
debian/qemu-user-static.1 usr/share/man/man1/
debian/qemu-debootstrap usr/sbin
debian/qemu-debootstrap.1 usr/share/man/man1/
debian/overrides/qemu-user-static usr/share/lintian/overrides/
......@@ -86,13 +86,13 @@ user_targets = \
endif # enable_linux_user
configure-stamp: configure
b/configure-stamp: configure
dh_testdir
# system build
rm -rf qemu-build; mkdir qemu-build
cd qemu-build && \
../configure ${common_configure_opts} --disable-user \
rm -rf b/qemu; mkdir -p b/qemu
cd b/qemu && \
../../configure ${common_configure_opts} --disable-user \
--${enable_system}-system \
--${enable_linux_user}-linux-user \
--enable-modules \
......@@ -101,44 +101,44 @@ configure-stamp: configure
$(QEMU_CONFIGURE_OPTIONS) || \
{ echo ===== CONFIGURE FAILED ===; tail -n 50 config.log; exit 1; }
# switch UI and audio modules back to be built-ins, for now
sed -i -r 's/(CONFIG_(CURSES|GTK|SDL|AUDIO_.*))=m/\1=y/' \
qemu-build/config-host.mak
# switch some simple UI and simple audio modules to be built-ins,
# but keep more complex to be modules to move to a separate package
sed -i -r 's/(CONFIG_(CURSES|-GTK|-SDL|AUDIO_(-PA|OSS|ALSA|-SDL)))=m/\1=y/' \
b/qemu/config-host.mak
ifeq ($(enable_linux_user),enable)
# do not use debian/configure-opts here, all optional stuff will be enabled
# automatically, dependencies are already verified in the main build
rm -rf user-static-build; mkdir user-static-build
cd user-static-build && \
../configure ${common_configure_opts} \
rm -rf b/user-static; mkdir b/user-static
cd b/user-static && \
../../configure ${common_configure_opts} \
--static --disable-system \
--target-list="$(addsuffix -linux-user,${user_targets})"
endif
touch $@
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
build-stamp: configure-stamp
build-arch: b/build-stamp
build-indep: b/build-stamp