From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHZqq-0004E1-KR for qemu-devel@nongnu.org; Mon, 18 Mar 2013 09:12:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHZqf-0000of-K2 for qemu-devel@nongnu.org; Mon, 18 Mar 2013 09:11:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHZqf-0000oV-AU for qemu-devel@nongnu.org; Mon, 18 Mar 2013 09:11:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2IDBWfj026496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Mar 2013 09:11:32 -0400 From: Alon Levy Date: Mon, 18 Mar 2013 15:10:59 +0200 Message-Id: <1363612272-13713-14-git-send-email-alevy@redhat.com> In-Reply-To: <1363612272-13713-1-git-send-email-alevy@redhat.com> References: <1363612272-13713-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH 13/26] ccid-card-passthru, dev-smartcard-reader: add debug environment variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mlureau@redhat.com From: Alon Levy This overrides whatever debug value is set on the corresponding devices from the command line, and is meant to ease the usage with any management stack. For libvirt you can set environment variables by extending the dom namespace, i.e: Signed-off-by: Alon Levy --- hw/ccid-card-passthru.c | 16 ++++++++++++++++ hw/usb/dev-smartcard-reader.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c index 111894f..80fe514 100644 --- a/hw/ccid-card-passthru.c +++ b/hw/ccid-card-passthru.c @@ -350,6 +350,22 @@ static int passthru_initfn(CCIDCardState *base) error_report("missing chardev"); return -1; } + { + char *debug_env = getenv("QEMU_CCID_PASSTHRU_DEBUG"); + char *inv = NULL; + int debug; + if (debug_env) { + debug = strtol(debug_env, &inv, 10); + if (inv != debug_env) { + if (debug < 0 || debug > D_VERBOSE) { + fprintf(stderr, "warning: QEMU_CCID_PASSTHRU_DEBUG" + " not in [0, %d]", D_VERBOSE); + } else { + card->debug = debug; + } + } + } + } assert(sizeof(DEFAULT_ATR) <= MAX_ATR_SIZE); memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR)); card->atr_length = sizeof(DEFAULT_ATR); diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index caebc1c..fc950c8 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1201,6 +1201,22 @@ static int ccid_initfn(USBDevice *dev) s->bulk_out_pos = 0; ccid_reset_parameters(s); ccid_reset(s); + { + char *debug_env = getenv("QEMU_CCID_DEBUG"); + char *inv = NULL; + int debug; + if (debug_env) { + debug = strtol(debug_env, &inv, 10); + if (inv != debug_env) { + if (debug < 0 || debug > D_VERBOSE) { + fprintf(stderr, "warning: QEMU_CCID_PASSTHRU_DEBUG" + " not in [0, %d]", D_VERBOSE); + } else { + s->debug = debug; + } + } + } + } return 0; } -- 1.8.1.4