Skip to content
This repository has been archived by the owner on Sep 17, 2023. It is now read-only.

Commit

Permalink
Make Gnome Boxes work again
Browse files Browse the repository at this point in the history
Signed-off-by: Peter O'Connor <[email protected]>
  • Loading branch information
Peter O'Connor committed Jul 16, 2018
1 parent 209af77 commit a54f6e7
Show file tree
Hide file tree
Showing 3 changed files with 158 additions and 7 deletions.
35 changes: 35 additions & 0 deletions files/Smartcard-passthrough-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From e58d64a16abc2304c4dcb644411eb9580bf63b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <[email protected]>
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 <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-id: [email protected]
Signed-off-by: Gerd Hoffmann <[email protected]>
---
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 7684db0cb37..25fb19b0d71 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,
3 changes: 2 additions & 1 deletion package.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name : qemu
version : 2.12.0
homepage : https://wiki.qemu.org/Main_Page
release : 27
release : 28
source :
- https://download.qemu.org/qemu-2.12.0.tar.xz : e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc
license : GPL-2.0-only
Expand Down Expand Up @@ -45,6 +45,7 @@ builddeps :
- lzo-devel
setup : |
%patch -p1 < $pkgfiles/security/cve-2018-3639.patch
%patch -p1 < $pkgfiles/Smartcard-passthrough-fix.patch
./configure --prefix=/usr \
--libdir=%libdir% \
--sysconfdir=/etc \
Expand Down
127 changes: 121 additions & 6 deletions pspec_x86_64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,131 @@ server and embedded PowerPC, and S390 guests.
</Description>
<PartOf>virt</PartOf>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/bin/ivshmem-client</Path>
<Path fileType="executable">/usr/bin/ivshmem-server</Path>
<Path fileType="executable">/usr/bin/qemu-arm</Path>
<Path fileType="executable">/usr/bin/qemu-ga</Path>
<Path fileType="executable">/usr/bin/qemu-i386</Path>
<Path fileType="executable">/usr/bin/qemu-img</Path>
<Path fileType="executable">/usr/bin/qemu-io</Path>
<Path fileType="executable">/usr/bin/qemu-mips</Path>
<Path fileType="executable">/usr/bin/qemu-mipsel</Path>
<Path fileType="executable">/usr/bin/qemu-nbd</Path>
<Path fileType="executable">/usr/bin/qemu-pr-helper</Path>
<Path fileType="executable">/usr/bin/qemu-system-arm</Path>
<Path fileType="executable">/usr/bin/qemu-system-i386</Path>
<Path fileType="executable">/usr/bin/qemu-system-mips</Path>
<Path fileType="executable">/usr/bin/qemu-system-mipsel</Path>
<Path fileType="executable">/usr/bin/qemu-system-x86_64</Path>
<Path fileType="executable">/usr/bin/qemu-x86_64</Path>
<Path fileType="executable">/usr/bin/virtfs-proxy-helper</Path>
<Path fileType="library">/usr/lib64/qemu/qemu-bridge-helper</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/qemu</Path>
<Path fileType="doc">/usr/share/doc/qemu/qemu-doc.html</Path>
<Path fileType="doc">/usr/share/doc/qemu/qemu-doc.txt</Path>
<Path fileType="doc">/usr/share/doc/qemu/qemu-ga-ref.html</Path>
<Path fileType="doc">/usr/share/doc/qemu/qemu-ga-ref.txt</Path>
<Path fileType="doc">/usr/share/doc/qemu/qemu-qmp-ref.html</Path>
<Path fileType="doc">/usr/share/doc/qemu/qemu-qmp-ref.txt</Path>
<Path fileType="man">/usr/share/man/man1/qemu-img.1</Path>
<Path fileType="man">/usr/share/man/man1/qemu.1</Path>
<Path fileType="man">/usr/share/man/man1/virtfs-proxy-helper.1</Path>
<Path fileType="man">/usr/share/man/man7/qemu-block-drivers.7</Path>
<Path fileType="man">/usr/share/man/man7/qemu-ga-ref.7</Path>
<Path fileType="man">/usr/share/man/man7/qemu-qmp-ref.7</Path>
<Path fileType="man">/usr/share/man/man8/qemu-ga.8</Path>
<Path fileType="man">/usr/share/man/man8/qemu-nbd.8</Path>
<Path fileType="data">/usr/share/qemu/QEMU,cgthree.bin</Path>
<Path fileType="data">/usr/share/qemu/QEMU,tcx.bin</Path>
<Path fileType="data">/usr/share/qemu/bamboo.dtb</Path>
<Path fileType="data">/usr/share/qemu/bios-256k.bin</Path>
<Path fileType="data">/usr/share/qemu/bios.bin</Path>
<Path fileType="data">/usr/share/qemu/canyonlands.dtb</Path>
<Path fileType="data">/usr/share/qemu/efi-e1000.rom</Path>
<Path fileType="data">/usr/share/qemu/efi-e1000e.rom</Path>
<Path fileType="data">/usr/share/qemu/efi-eepro100.rom</Path>
<Path fileType="data">/usr/share/qemu/efi-ne2k_pci.rom</Path>
<Path fileType="data">/usr/share/qemu/efi-pcnet.rom</Path>
<Path fileType="data">/usr/share/qemu/efi-rtl8139.rom</Path>
<Path fileType="data">/usr/share/qemu/efi-virtio.rom</Path>
<Path fileType="data">/usr/share/qemu/efi-vmxnet3.rom</Path>
<Path fileType="data">/usr/share/qemu/hppa-firmware.img</Path>
<Path fileType="data">/usr/share/qemu/keymaps/ar</Path>
<Path fileType="data">/usr/share/qemu/keymaps/bepo</Path>
<Path fileType="data">/usr/share/qemu/keymaps/common</Path>
<Path fileType="data">/usr/share/qemu/keymaps/cz</Path>
<Path fileType="data">/usr/share/qemu/keymaps/da</Path>
<Path fileType="data">/usr/share/qemu/keymaps/de</Path>
<Path fileType="data">/usr/share/qemu/keymaps/de-ch</Path>
<Path fileType="data">/usr/share/qemu/keymaps/en-gb</Path>
<Path fileType="data">/usr/share/qemu/keymaps/en-us</Path>
<Path fileType="data">/usr/share/qemu/keymaps/es</Path>
<Path fileType="data">/usr/share/qemu/keymaps/et</Path>
<Path fileType="data">/usr/share/qemu/keymaps/fi</Path>
<Path fileType="data">/usr/share/qemu/keymaps/fo</Path>
<Path fileType="data">/usr/share/qemu/keymaps/fr</Path>
<Path fileType="data">/usr/share/qemu/keymaps/fr-be</Path>
<Path fileType="data">/usr/share/qemu/keymaps/fr-ca</Path>
<Path fileType="data">/usr/share/qemu/keymaps/fr-ch</Path>
<Path fileType="data">/usr/share/qemu/keymaps/hr</Path>
<Path fileType="data">/usr/share/qemu/keymaps/hu</Path>
<Path fileType="data">/usr/share/qemu/keymaps/is</Path>
<Path fileType="data">/usr/share/qemu/keymaps/it</Path>
<Path fileType="data">/usr/share/qemu/keymaps/ja</Path>
<Path fileType="data">/usr/share/qemu/keymaps/lt</Path>
<Path fileType="data">/usr/share/qemu/keymaps/lv</Path>
<Path fileType="data">/usr/share/qemu/keymaps/mk</Path>
<Path fileType="data">/usr/share/qemu/keymaps/modifiers</Path>
<Path fileType="data">/usr/share/qemu/keymaps/nl</Path>
<Path fileType="data">/usr/share/qemu/keymaps/nl-be</Path>
<Path fileType="data">/usr/share/qemu/keymaps/no</Path>
<Path fileType="data">/usr/share/qemu/keymaps/pl</Path>
<Path fileType="data">/usr/share/qemu/keymaps/pt</Path>
<Path fileType="data">/usr/share/qemu/keymaps/pt-br</Path>
<Path fileType="data">/usr/share/qemu/keymaps/ru</Path>
<Path fileType="data">/usr/share/qemu/keymaps/sl</Path>
<Path fileType="data">/usr/share/qemu/keymaps/sv</Path>
<Path fileType="data">/usr/share/qemu/keymaps/th</Path>
<Path fileType="data">/usr/share/qemu/keymaps/tr</Path>
<Path fileType="data">/usr/share/qemu/kvmvapic.bin</Path>
<Path fileType="data">/usr/share/qemu/linuxboot.bin</Path>
<Path fileType="data">/usr/share/qemu/linuxboot_dma.bin</Path>
<Path fileType="data">/usr/share/qemu/multiboot.bin</Path>
<Path fileType="data">/usr/share/qemu/openbios-ppc</Path>
<Path fileType="data">/usr/share/qemu/openbios-sparc32</Path>
<Path fileType="data">/usr/share/qemu/openbios-sparc64</Path>
<Path fileType="data">/usr/share/qemu/palcode-clipper</Path>
<Path fileType="data">/usr/share/qemu/petalogix-ml605.dtb</Path>
<Path fileType="data">/usr/share/qemu/petalogix-s3adsp1800.dtb</Path>
<Path fileType="data">/usr/share/qemu/ppc_rom.bin</Path>
<Path fileType="data">/usr/share/qemu/pxe-e1000.rom</Path>
<Path fileType="data">/usr/share/qemu/pxe-eepro100.rom</Path>
<Path fileType="data">/usr/share/qemu/pxe-ne2k_pci.rom</Path>
<Path fileType="data">/usr/share/qemu/pxe-pcnet.rom</Path>
<Path fileType="data">/usr/share/qemu/pxe-rtl8139.rom</Path>
<Path fileType="data">/usr/share/qemu/pxe-virtio.rom</Path>
<Path fileType="data">/usr/share/qemu/qemu-icon.bmp</Path>
<Path fileType="data">/usr/share/qemu/qemu_logo_no_text.svg</Path>
<Path fileType="data">/usr/share/qemu/qemu_vga.ndrv</Path>
<Path fileType="data">/usr/share/qemu/s390-ccw.img</Path>
<Path fileType="data">/usr/share/qemu/s390-netboot.img</Path>
<Path fileType="data">/usr/share/qemu/sgabios.bin</Path>
<Path fileType="data">/usr/share/qemu/skiboot.lid</Path>
<Path fileType="data">/usr/share/qemu/slof.bin</Path>
<Path fileType="data">/usr/share/qemu/spapr-rtas.bin</Path>
<Path fileType="data">/usr/share/qemu/trace-events-all</Path>
<Path fileType="data">/usr/share/qemu/u-boot-sam460-20100605.bin</Path>
<Path fileType="data">/usr/share/qemu/u-boot.e500</Path>
<Path fileType="data">/usr/share/qemu/vgabios-cirrus.bin</Path>
<Path fileType="data">/usr/share/qemu/vgabios-qxl.bin</Path>
<Path fileType="data">/usr/share/qemu/vgabios-stdvga.bin</Path>
<Path fileType="data">/usr/share/qemu/vgabios-virtio.bin</Path>
<Path fileType="data">/usr/share/qemu/vgabios-vmware.bin</Path>
<Path fileType="data">/usr/share/qemu/vgabios.bin</Path>
</Files>
</Package>
<History>
<Update release="27">
<Date>2018-05-29</Date>
<Update release="28">
<Date>2018-07-16</Date>
<Version>2.12.0</Version>
<Comment>Packaging update</Comment>
<Name>Peter O&apos;Connor</Name>
Expand Down

0 comments on commit a54f6e7

Please sign in to comment.