From patchwork Thu Jun 18 12:29:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 50042 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2E88822903 for ; Thu, 18 Jun 2015 12:34:24 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf20243691lbb.0 for ; Thu, 18 Jun 2015 05:34:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :from:date:message-id:to:content-type:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=w8dpFeuDYfDO2bUhM1EKDG98xHBWzCUrI1F++yT+hZc=; b=F7KQvJ5TAJ6v47+FDQmlDUD6DVaehn0CYUYcdcQoUNhGjmb/2iCcvtZjcOe1vEo8aZ xoLf3RxX9/2c3Nf5QSaPrbNiHRm6d24cv/t00yk/oRzk16zYfWxZ7DwFessYDifcewee EYWhGRYlHlelONWDluAmZFz7It/z0EjKZn3XwVu+UzYP2Ws6LkJt4IihxnDjc3M64dcf CeGK+B1qjHfNg6Ajzyy6xZ2sLVhz6n1s81WsmDPNAAy9I0uBgOUKhL/CTshNlrKmUNYQ ZDWUNxnJYAMoosn3zP3Tce7PRZ3EKnng6jRZ++g8C2M9pz2PEzS2TdLmWvpt6HVOGRS5 bKFA== X-Gm-Message-State: ALoCoQnRXOOAvmkEbeMdoFp9N3TsuB3fmE7Gs+6JeXCpJTKF6ou523qumqxx1XdXUoTgIefHjH7j X-Received: by 10.194.179.42 with SMTP id dd10mr2850308wjc.7.1434630863121; Thu, 18 Jun 2015 05:34:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.74 with SMTP id k10ls458973laf.30.gmail; Thu, 18 Jun 2015 05:34:22 -0700 (PDT) X-Received: by 10.152.239.131 with SMTP id vs3mr13011949lac.102.1434630862950; Thu, 18 Jun 2015 05:34:22 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id u14si6363958lal.40.2015.06.18.05.34.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2015 05:34:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbqq2 with SMTP id qq2so51240016lbb.3 for ; Thu, 18 Jun 2015 05:34:22 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr12518449lac.41.1434630862802; Thu, 18 Jun 2015 05:34:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1151434lbb; Thu, 18 Jun 2015 05:34:21 -0700 (PDT) X-Received: by 10.55.43.170 with SMTP id r42mr23518451qkr.95.1434630861430; Thu, 18 Jun 2015 05:34:21 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y125si7552862qky.65.2015.06.18.05.34.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Jun 2015 05:34:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:52448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Z1Q-0006a6-IO for patch@linaro.org; Thu, 18 Jun 2015 08:34:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5YxI-00088L-CF for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:30:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5YxF-00024c-6D for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:30:04 -0400 Received: from mail-yk0-f172.google.com ([209.85.160.172]:35457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5YxF-00024S-2l for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:30:01 -0400 Received: by ykar6 with SMTP id r6so64475040yka.2 for ; Thu, 18 Jun 2015 05:30:00 -0700 (PDT) X-Received: by 10.52.251.195 with SMTP id zm3mr8140997vdc.41.1434630600534; Thu, 18 Jun 2015 05:30:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.153.135 with HTTP; Thu, 18 Jun 2015 05:29:40 -0700 (PDT) In-Reply-To: <558030A2.1070005@imgtec.com> References: <1432656234-9791-1-git-send-email-leon.alrae@imgtec.com> <1432656234-9791-3-git-send-email-leon.alrae@imgtec.com> <55720210.7010200@imgtec.com> <6BDA2EA9-1775-4414-B022-B8853BA60373@livius.net> <6D084A97-1CFB-47AA-A4C3-CCFC3A66DDEC@livius.net> <558030A2.1070005@imgtec.com> From: Peter Maydell Date: Thu, 18 Jun 2015 13:29:40 +0100 Message-ID: To: Leon Alrae X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.172 Cc: Liviu Ionescu , Christopher Covington , QEMU Developers , Matthew Fortune Subject: Re: [Qemu-devel] [PATCH v4 2/2] semihosting: add --semihosting-config arg sub-argument 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On 16 June 2015 at 15:20, Leon Alrae wrote: > On 16/06/2015 15:03, Peter Maydell wrote: >> On 16 June 2015 at 13:32, Liviu Ionescu wrote: >>> would it be possible to have all the semihosting patches ready for 2.4? >> >> Yes, I agree that would be good. Is it just this 2 patch >> series, or are there others too? > > Just to confirm -- the only thing required before applying this 2 patch series > is testing in ARM context by you, right? That, and you need to respin it, because the qemu_opt_foreach API has changed in current master. Something like this is probably sufficient but you should check: index 5edfa00..278cd6a 100644 } @@ -3727,7 +3729,7 @@ int main(int argc, char **argv, char **envp) } /* Set semihosting argument count and vector */ qemu_opt_foreach(opts, add_semihosting_arg, - &semihosting, 0); + &semihosting, NULL); } else { fprintf(stderr, "Unsupported semihosting-config %s\n", optarg); thanks -- PMM --- a/vl.c +++ b/vl.c @@ -1292,7 +1292,9 @@ const char *semihosting_get_cmdline(void) return semihosting.cmdline; } -static int add_semihosting_arg(const char *name, const char *val, void *opaque) +static int add_semihosting_arg(void *opaque, + const char *name, const char *val, + Error **errp) { SemihostingConfig *s = opaque; if (strcmp(name, "arg") == 0) { @@ -1311,12 +1313,12 @@ static inline void semihosting_arg_fallback(const char *file, const char *cmd) char *cmd_token; /* argv[0] */ - add_semihosting_arg("arg", file, &semihosting); + add_semihosting_arg(&semihosting, "arg", file, NULL); /* split -append and initialize argv[1..n] */ cmd_token = strtok(g_strdup(cmd), " "); while (cmd_token) { - add_semihosting_arg("arg", cmd_token, &semihosting); + add_semihosting_arg(&semihosting, "arg", cmd_token, NULL); cmd_token = strtok(NULL, " "); }