From nobody Tue Feb 10 13:01:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500539520380275.3518281003618; Thu, 20 Jul 2017 01:32:00 -0700 (PDT) Received: from localhost ([::1]:36674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dY6s8-0002JB-Pg for importer@patchew.org; Thu, 20 Jul 2017 04:31:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dY6mx-0006GC-Nh for qemu-devel@nongnu.org; Thu, 20 Jul 2017 04:26:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dY6mw-0004rV-9w for qemu-devel@nongnu.org; Thu, 20 Jul 2017 04:26:27 -0400 Received: from manul.sfritsch.de ([2a01:4f8:172:195f:112::2]:36947) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dY6mw-0004rF-18 for qemu-devel@nongnu.org; Thu, 20 Jul 2017 04:26:26 -0400 From: Stefan Fritsch To: Gerd Hoffmann , qemu-devel@nongnu.org Date: Thu, 20 Jul 2017 10:25:23 +0200 Message-Id: <1500539123-23884-9-git-send-email-sf@sfritsch.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1500539123-23884-1-git-send-email-sf@sfritsch.de> References: <1500539123-23884-1-git-send-email-sf@sfritsch.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:4f8:172:195f:112::2 Subject: [Qemu-devel] [PATCH 8/8] usb-ccid: Reduce logging at level WARN X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Fritsch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefan Fritsch Change all DPRINTF()s using (1 =3D=3D WARN) to use symbolic constants. Most of these DPRINTFs are now only logging at higher log levels. This allows to use ccid's debug level 1 =3D=3D WARN in normal operation. Signed-off-by: Stefan Fritsch --- hw/usb/dev-smartcard-reader.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index dff856d456..ef2d068701 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -669,7 +669,7 @@ static void ccid_handle_reset(USBDevice *dev) { USBCCIDState *s =3D USB_CCID_DEV(dev); =20 - DPRINTF(s, 1, "Reset\n"); + DPRINTF(s, D_VERBOSE, "Reset\n"); =20 ccid_reset(s); } @@ -713,7 +713,7 @@ static void ccid_handle_control(USBDevice *dev, USBPack= et *p, int request, USBCCIDState *s =3D USB_CCID_DEV(dev); int ret; =20 - DPRINTF(s, 1, "%s: got control %s (%x), value %x\n", __func__, + DPRINTF(s, D_TRACE, "%s: got control %s (%x), value %x\n", __func__, ccid_control_to_str(s, request), request, value); ret =3D usb_desc_handle_control(dev, p, request, value, index, length,= data); if (ret >=3D 0) { @@ -723,19 +723,20 @@ static void ccid_handle_control(USBDevice *dev, USBPa= cket *p, int request, switch (request) { /* Class specific requests. */ case ClassInterfaceOutRequest | CCID_CONTROL_ABORT: - DPRINTF(s, 1, "ccid_control abort UNIMPLEMENTED\n"); + DPRINTF(s, D_INFO, "ccid_control abort UNIMPLEMENTED\n"); p->status =3D USB_RET_STALL; break; case ClassInterfaceRequest | CCID_CONTROL_GET_CLOCK_FREQUENCIES: - DPRINTF(s, 1, "ccid_control get clock frequencies UNIMPLEMENTED\n"= ); + DPRINTF(s, D_INFO, + "ccid_control get clock frequencies UNIMPLEMENTED\n"); p->status =3D USB_RET_STALL; break; case ClassInterfaceRequest | CCID_CONTROL_GET_DATA_RATES: - DPRINTF(s, 1, "ccid_control get data rates UNIMPLEMENTED\n"); + DPRINTF(s, D_INFO, "ccid_control get data rates UNIMPLEMENTED\n"); p->status =3D USB_RET_STALL; break; default: - DPRINTF(s, 1, "got unsupported/bogus control %x, value %x\n", + DPRINTF(s, D_INFO, "got unsupported/bogus control %x, value %x\n", request, value); p->status =3D USB_RET_STALL; break; @@ -1020,13 +1021,13 @@ static void ccid_on_apdu_from_guest(USBCCIDState *s= , CCID_XferBlock *recv) uint32_t len; =20 if (ccid_card_status(s) !=3D ICC_STATUS_PRESENT_ACTIVE) { - DPRINTF(s, 1, + DPRINTF(s, D_INFO, "usb-ccid: not sending apdu to client, no card connected\n= "); ccid_write_data_block_error(s, recv->hdr.bSlot, recv->hdr.bSeq); return; } len =3D le32_to_cpu(recv->hdr.dwLength); - DPRINTF(s, 1, "%s: seq %d, len %d\n", __func__, + DPRINTF(s, D_TRACE, "%s: seq %d, len %d\n", __func__, recv->hdr.bSeq, len); if (le16_to_cpu(recv->wLevelParameter)) { DPRINTF(s, D_WARN, "Unsupported non-zero level Parameter %x\n", @@ -1087,7 +1088,7 @@ static void ccid_handle_bulk_out(USBCCIDState *s, USB= Packet *p) return; } if (s->bulk_out_pos - 10 !=3D ccid_header->dwLength) { - DPRINTF(s, 1, + DPRINTF(s, D_WARN, "usb-ccid: bulk_in: message size mismatch (got %d, expecte= d %d)\n", s->bulk_out_pos - 10, ccid_header->dwLength); goto err; @@ -1101,7 +1102,7 @@ static void ccid_handle_bulk_out(USBCCIDState *s, USB= Packet *p) ccid_write_slot_status(s, ccid_header); break; case CCID_MESSAGE_TYPE_PC_to_RDR_IccPowerOn: - DPRINTF(s, 1, "%s: PowerOn: %d\n", __func__, + DPRINTF(s, D_VERBOSE, "%s: PowerOn: %d\n", __func__, ((CCID_IccPowerOn *)(ccid_header))->bPowerSelect); s->powered =3D true; if (!ccid_card_inserted(s)) { @@ -1137,7 +1138,7 @@ static void ccid_handle_bulk_out(USBCCIDState *s, USB= Packet *p) ccid_write_slot_status(s, ccid_header); break; default: - DPRINTF(s, 1, + DPRINTF(s, D_WARN, "handle_data: ERROR: unhandled message type %Xh\n", ccid_header->bMessageType); /* @@ -1229,13 +1230,13 @@ static void ccid_handle_data(USBDevice *dev, USBPac= ket *p) } break; default: - DPRINTF(s, 1, "Bad endpoint\n"); + DPRINTF(s, D_INFO, "Bad endpoint\n"); p->status =3D USB_RET_STALL; break; } break; default: - DPRINTF(s, 1, "Bad token\n"); + DPRINTF(s, D_INFO, "Bad token\n"); p->status =3D USB_RET_STALL; break; } @@ -1285,7 +1286,7 @@ void ccid_card_send_apdu_to_guest(CCIDCardState *card, Answer *answer; =20 if (!ccid_has_pending_answers(s)) { - DPRINTF(s, 1, "CCID ERROR: got an APDU without pending answers\n"); + DPRINTF(s, D_WARN, "CCID ERROR: got an APDU without pending answer= s\n"); return; } s->bmCommandStatus =3D COMMAND_STATUS_NO_ERROR; @@ -1295,7 +1296,7 @@ void ccid_card_send_apdu_to_guest(CCIDCardState *card, ccid_report_error_failed(s, ERROR_HW_ERROR); return; } - DPRINTF(s, 1, "APDU returned to guest %d (answer seq %d, slot %d)\n", + DPRINTF(s, D_TRACE, "APDU returned to guest %d (answer seq %d, slot %d= )\n", len, answer->seq, answer->slot); ccid_write_data_block_answer(s, apdu, len); } @@ -1317,7 +1318,7 @@ int ccid_card_ccid_attach(CCIDCardState *card) USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s =3D USB_CCID_DEV(dev); =20 - DPRINTF(s, 1, "CCID Attach\n"); + DPRINTF(s, D_VERBOSE, "CCID Attach\n"); if (s->migration_state =3D=3D MIGRATION_MIGRATED) { s->migration_state =3D MIGRATION_NONE; } @@ -1330,7 +1331,7 @@ void ccid_card_ccid_detach(CCIDCardState *card) USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s =3D USB_CCID_DEV(dev); =20 - DPRINTF(s, 1, "CCID Detach\n"); + DPRINTF(s, D_VERBOSE, "CCID Detach\n"); if (ccid_card_inserted(s)) { ccid_on_slot_change(s, false); } @@ -1345,7 +1346,7 @@ void ccid_card_card_error(CCIDCardState *card, uint64= _t error) =20 s->bmCommandStatus =3D COMMAND_STATUS_FAILED; s->last_answer_error =3D error; - DPRINTF(s, 1, "VSC_Error: %" PRIX64 "\n", s->last_answer_error); + DPRINTF(s, D_INFO, "VSC_Error: %" PRIX64 "\n", s->last_answer_error); /* TODO: these errors should be more verbose and propagated to the gue= st.*/ /* * We flush all pending answers on CardRemove message in ccid-card-pas= sthru, --=20 2.11.0