From patchwork Sun Jun 21 07:24:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Ionescu X-Patchwork-Id: 487043 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 6B31B1401DE for ; Sun, 21 Jun 2015 17:24:35 +1000 (AEST) Received: from localhost ([::1]:35358 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6ZcE-0000IX-06 for incoming@patchwork.ozlabs.org; Sun, 21 Jun 2015 03:24:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6Zbz-0008Sk-P9 for qemu-devel@nongnu.org; Sun, 21 Jun 2015 03:24:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z6Zbu-00076B-PK for qemu-devel@nongnu.org; Sun, 21 Jun 2015 03:24:15 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:34228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6Zbu-00075l-Ii for qemu-devel@nongnu.org; Sun, 21 Jun 2015 03:24:10 -0400 Received: by wgfq1 with SMTP id q1so71339184wgf.1 for ; Sun, 21 Jun 2015 00:24:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:content-type:content-transfer-encoding :subject:message-id:date:to:mime-version; bh=pW16Gq4oO8QhQNaNrv7Qw1jRGYDllTV6oP2uJVMQt1E=; b=XgX/BlwregcNkWWHBlMNQENj8ivX0WIWscEKuqX0oK9FblpqZ+qO4dQsGXN2isGs81 G4ZNsAbsyohJuwLygn49E0hQFD/s1cn7ZDr/wFHPAJAmEK7aiGN2c9XOpP8XYZi/HFxw PxlZLA2BRFpGo20GGwruMVKnxmlg7I9SCLu3yejM1dD3ixr657Ye5yvU0hArIHZeBTlS cYbqp733RyrtbAWBC34K0lWCg7sz1kDLaJX0vgYgzA2DLfwioec0ku8Vz4I8CAkrByxS J3+lKMUk1O5idEOEKSLXKd6XXkNyjjasoAu6dFBTzbgOKC1PqN3k+ZtU+1az2nZY+tyg stlw== X-Gm-Message-State: ALoCoQnOFpZYqweOm5ZazKhGuLRGtXs/qidggyUvsPk8uMuD8pwo6CSNfU4NxH+4kqDllFOEZuU+ X-Received: by 10.194.205.37 with SMTP id ld5mr41410026wjc.14.1434871449737; Sun, 21 Jun 2015 00:24:09 -0700 (PDT) Received: from [172.16.62.12] ([109.99.239.84]) by mx.google.com with ESMTPSA id v3sm24571955wja.31.2015.06.21.00.24.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Jun 2015 00:24:08 -0700 (PDT) From: Liviu Ionescu Message-Id: Date: Sun, 21 Jun 2015 10:24:06 +0300 To: qemu-devel@nongnu.org Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) X-Mailer: Apple Mail (2.2098) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.45 Subject: [Qemu-devel] [PATCH] target-arm: default empty semihosting cmdline 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 If neither explicit semihosting args nor -kernel are used, make SYS_GET_CMDLINE return an empty string. Signed-off-by: Liviu Ionescu --- target-arm/arm-semi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c index 74a67e9..a2a7369 100644 --- a/target-arm/arm-semi.c +++ b/target-arm/arm-semi.c @@ -436,12 +436,19 @@ uint32_t do_arm_semihosting(CPUARMState *env) size_t input_size; size_t output_size; int status = 0; +#if !defined(CONFIG_USER_ONLY) + const char *cmdline; +#endif GET_ARG(0); GET_ARG(1); input_size = arg1; /* Compute the size of the output string. */ #if !defined(CONFIG_USER_ONLY) - output_size = strlen(semihosting_get_cmdline()) + 1; + cmdline = semihosting_get_cmdline(); + if (cmdline == NULL) { + cmdline = ""; /* Default to an empty line. */ + } + output_size = strlen(cmdline) + 1; /* Count terminating 0. */ #else unsigned int i; @@ -472,7 +479,7 @@ uint32_t do_arm_semihosting(CPUARMState *env) /* Copy the command-line arguments. */ #if !defined(CONFIG_USER_ONLY) - pstrcpy(output_buffer, output_size, semihosting_get_cmdline()); + pstrcpy(output_buffer, output_size, cmdline); #else if (output_size == 1) { /* Empty command-line. */