On Thu, Jul 20, 2017 at 11:04 AM Stefan Fritsch <s...@sfritsch.de> wrote:
> From: Stefan Fritsch <stefan_frit...@genua.de>
>
> Change all DPRINTF()s using (1 == 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 == WARN in normal operation.
>
> Signed-off-by: Stefan Fritsch <stefan_frit...@genua.de>
> ---
> 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 72324e8313..fcc3ac1338 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 = USB_CCID_DEV(dev);
>
> - DPRINTF(s, 1, "Reset\n");
> + DPRINTF(s, D_VERBOSE, "Reset\n");
>
> ccid_reset(s);
> }
> @@ -713,7 +713,7 @@ static void ccid_handle_control(USBDevice *dev,
> USBPacket *p, int request,
> USBCCIDState *s = USB_CCID_DEV(dev);
> int ret;
>
> - 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 = usb_desc_handle_control(dev, p, request, value, index, length,
> data);
> if (ret >= 0) {
> @@ -723,19 +723,20 @@ static void ccid_handle_control(USBDevice *dev,
> USBPacket *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 = 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 = 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 = USB_RET_STALL;
> break;
>
WARN was quite appropriate for unimplemented code reached, no?
> 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);
>
I would also keep it at WARN here, (as the unhandled case in
ccid_handle_bulk_out)
p->status = USB_RET_STALL;
> break;
> @@ -1020,13 +1021,13 @@ static void ccid_on_apdu_from_guest(USBCCIDState
> *s, CCID_XferBlock *recv)
> uint32_t len;
>
> if (ccid_card_status(s) != 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 = 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,
> USBPacket *p)
> return;
> }
> if (s->bulk_out_pos - 10 != ccid_header->dwLength) {
> - DPRINTF(s, 1,
> + DPRINTF(s, D_WARN,
> "usb-ccid: bulk_in: message size mismatch (got %d,
> expected %d)\n",
> s->bulk_out_pos - 10, ccid_header->dwLength);
> goto err;
> @@ -1101,7 +1102,7 @@ static void ccid_handle_bulk_out(USBCCIDState *s,
> USBPacket *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 = true;
> if (!ccid_card_inserted(s)) {
> @@ -1137,7 +1138,7 @@ static void ccid_handle_bulk_out(USBCCIDState *s,
> USBPacket *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,
> USBPacket *p)
> }
> break;
> default:
> - DPRINTF(s, 1, "Bad endpoint\n");
> + DPRINTF(s, D_INFO, "Bad endpoint\n");
> p->status = USB_RET_STALL;
> break;
> }
> break;
> default:
> - DPRINTF(s, 1, "Bad token\n");
> + DPRINTF(s, D_INFO, "Bad token\n");
> p->status = USB_RET_STALL;
> break;
> }
> @@ -1285,7 +1286,7 @@ void ccid_card_send_apdu_to_guest(CCIDCardState
> *card,
> Answer *answer;
>
> 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
> answers\n");
> return;
> }
> s->bmCommandStatus = 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 = USB_DEVICE(qdev->parent_bus->parent);
> USBCCIDState *s = USB_CCID_DEV(dev);
>
> - DPRINTF(s, 1, "CCID Attach\n");
> + DPRINTF(s, D_VERBOSE, "CCID Attach\n");
> if (s->migration_state == MIGRATION_MIGRATED) {
> s->migration_state = MIGRATION_NONE;
> }
> @@ -1330,7 +1331,7 @@ void ccid_card_ccid_detach(CCIDCardState *card)
> USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent);
> USBCCIDState *s = USB_CCID_DEV(dev);
>
> - 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)
>
> s->bmCommandStatus = COMMAND_STATUS_FAILED;
> s->last_answer_error = error;
> - DPRINTF(s, 1, "VSC_Error: %" PRIX64 "\n", s->last_answer_error);
> + DPRINTF(s, D_INFO, "VSC_Error: %" PRIX64 "\n", s->last_answer_error);
>
I'd keep WARN here too
> /* TODO: these errors should be more verbose and propagated to the
> guest.*/
> /*
> * We flush all pending answers on CardRemove message in
> ccid-card-passthru,
> --
>
--
Marc-André Lureau
