yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 5e6d388c89b6437aeb9f54607ed09fe75bb9c2cd Mon Sep 17 00:00:00 2001
26ba25
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
26ba25
Date: Mon, 11 Jun 2018 17:13:26 +0200
26ba25
Subject: [PATCH 006/268] ccid-card-passthru: fix regression in realize()
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
Message-id: <20180611171326.5043-1-marcandre.lureau@redhat.com>
26ba25
Patchwork-id: 80632
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH] ccid-card-passthru: fix regression in realize()
26ba25
Bugzilla: 1584984
26ba25
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
26ba25
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
26ba25
RH-Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
26ba25
Since cc847bfd16d894fd8c1a2ce25f31772f6cdbbc74, CCID card-passthru
26ba25
fails to intialize, because it changed a debug line to an error,
26ba25
probably by mistake. Change it back to a DPRINTF debug.
26ba25
26ba25
(solves Boxes creating VM with smartcard passthru failing to start)
26ba25
26ba25
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
26ba25
Message-id: 20180515153039.27514-1-marcandre.lureau@redhat.com
26ba25
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
26ba25
26ba25
(cherry picked from commit e58d64a16abc2304c4dcb644411eb9580bf63b1e)
26ba25
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 hw/usb/ccid-card-passthru.c | 2 +-
26ba25
 1 file changed, 1 insertion(+), 1 deletion(-)
26ba25
26ba25
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
26ba25
index b7dd360..668a22d 100644
26ba25
--- a/hw/usb/ccid-card-passthru.c
26ba25
+++ b/hw/usb/ccid-card-passthru.c
26ba25
@@ -345,7 +345,7 @@ static void passthru_realize(CCIDCardState *base, Error **errp)
26ba25
     card->vscard_in_pos = 0;
26ba25
     card->vscard_in_hdr = 0;
26ba25
     if (qemu_chr_fe_backend_connected(&card->cs)) {
26ba25
-        error_setg(errp, "ccid-card-passthru: initing chardev");
26ba25
+        DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev");
26ba25
         qemu_chr_fe_set_handlers(&card->cs,
26ba25
             ccid_card_vscard_can_read,
26ba25
             ccid_card_vscard_read,
26ba25
-- 
26ba25
1.8.3.1
26ba25