From patchwork Fri Mar 13 19:45:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeremy White X-Patchwork-Id: 450074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7CFF614012F for ; Sat, 14 Mar 2015 06:49:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=neutral reason="verification failed; unprotected key/testing" header.d=codeweavers.com header.i=@codeweavers.com header.b=ABwS0CkN; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:38436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWVag-0006Km-PR for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2015 15:49:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWVWn-0007JS-HA for qemu-devel@nongnu.org; Fri, 13 Mar 2015 15:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YWVWf-0002HE-5L for qemu-devel@nongnu.org; Fri, 13 Mar 2015 15:45:49 -0400 Received: from mail.codeweavers.com ([216.251.189.131]:46818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWVWe-0002FC-Ls for qemu-devel@nongnu.org; Fri, 13 Mar 2015 15:45:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codeweavers.com; s=6377696661; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=r5YHbYWMOdhpEWiSME+2+kulDh9UuW2jbT6Y5PBEqdA=; b=ABwS0CkN3lE7ZYYgN6ERROCDu4vo3+fBicsfITPItpDxo2B0isISXOoEMdRCL6FWX5l0K7w8qaJjpGOUFM6jnswB+sRzsM6rqsriTEQy4xESTaer3Yc8LaruAefOps9bxrAhJYoYTqlSW8d6DeR+Jgou9AH/Sgjk6CVZckchsZk=; Received: from jwhite.mn.codeweavers.com ([10.69.137.101] helo=jwhite.mn.codeweavers.com.) by mail.codeweavers.com with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1YWVWX-0001m6-Iv for qemu-devel@nongnu.org; Fri, 13 Mar 2015 14:45:33 -0500 From: Jeremy White To: qemu-devel@nongnu.org Date: Fri, 13 Mar 2015 14:45:24 -0500 Message-Id: <1426275924-1904-8-git-send-email-jwhite@codeweavers.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1426275924-1904-1-git-send-email-jwhite@codeweavers.com> References: <1426275924-1904-1-git-send-email-jwhite@codeweavers.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 216.251.189.131 Subject: [Qemu-devel] [PATCH v3 7/7] Remove the (broken) passthru option. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org That option can be achieved using -e "use_hw=yes hw_type=passthru" Signed-off-by: Jeremy White Reviewed-by: Marc-André Lureau --- libcacard/vscclient.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c index fa6041d..8573f50 100644 --- a/libcacard/vscclient.c +++ b/libcacard/vscclient.c @@ -41,14 +41,8 @@ print_byte_array( static void print_usage(void) { - printf("vscclient [-c .. -e -d %s] " - " \n", -#ifdef USE_PASSTHRU - " -p"); - printf(" -p use passthrough mode\n"); -#else - ""); -#endif + printf("vscclient [-c .. -e -d ] " + " \n"); vcard_emul_usage(); } @@ -673,7 +667,7 @@ main( } #endif - while ((c = getopt(argc, argv, "c:e:pd:")) != -1) { + while ((c = getopt(argc, argv, "c:e:d:")) != -1) { switch (c) { case 'c': if (cert_count >= MAX_CERTS) { @@ -685,10 +679,6 @@ main( case 'e': emul_args = optarg; break; - case 'p': - print_usage(); - exit(4); - break; case 'd': verbose = get_id_from_string(optarg, 1); break;