From patchwork Fri Oct 16 12:13: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: 55097 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id E95F522FFA for ; Fri, 16 Oct 2015 12:14:59 +0000 (UTC) Received: by wijq8 with SMTP id q8sf1842190wij.1 for ; Fri, 16 Oct 2015 05:14:59 -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=uSVZVrTrez4rmvXv5ug3BKxA4EmrkV0H67IbHalmNY0=; b=WCS6v97r6hNe9cux0kFj66FmN61nAXudMq5PBYdBfRYODtEKDlQ30ASpB/TGyMi9NQ pv+t5zsFD8YEwqUpzwNXcROKwo19vy/JLlaAu/YWzVIXHcnFjS4IopnbnmVYPut1veKa fMf5uF7jMMr3oxjx3RQoyRYoszHXEfFUaSZA7dvwQ48vfslLUfttblpHqW5TlbeEo6eH WstSFt2EWhU8sJ18LleG+zF2sIOFswFhgXsNZ2GRC08VuC4AzgdcnFQoBG3O9/W2sapr tQeG3qDfr9iob4OGan+5OeXjiVkTiS7ib8PBFY4t18InAxij7Zhy3W0oGj96DerFNm4L diGg== X-Gm-Message-State: ALoCoQnwWbSOu+E6Xlk+0iCb1tZKt1CFOTaBrQExC5vt6E29mX8tz2vYNm4Gcuxu0UfNno8koJLs X-Received: by 10.112.132.10 with SMTP id oq10mr3542709lbb.1.1444997699255; Fri, 16 Oct 2015 05:14:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.145.132 with SMTP id t126ls336182lfd.89.gmail; Fri, 16 Oct 2015 05:14:58 -0700 (PDT) X-Received: by 10.112.126.70 with SMTP id mw6mr8182028lbb.81.1444997698975; Fri, 16 Oct 2015 05:14:58 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id h185si12702018lfg.121.2015.10.16.05.14.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 05:14:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbwb3 with SMTP id wb3so37592598lbb.1 for ; Fri, 16 Oct 2015 05:14:58 -0700 (PDT) X-Received: by 10.112.161.168 with SMTP id xt8mr7098435lbb.88.1444997698504; Fri, 16 Oct 2015 05:14:58 -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.59.35 with SMTP id w3csp1241920lbq; Fri, 16 Oct 2015 05:14:57 -0700 (PDT) X-Received: by 10.140.237.207 with SMTP id i198mr19587745qhc.45.1444997697277; Fri, 16 Oct 2015 05:14:57 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b7si17586408qgb.92.2015.10.16.05.14.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 Oct 2015 05:14:57 -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]:53263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn3uT-0000yo-05 for patch@linaro.org; Fri, 16 Oct 2015 08:14:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn3tc-0000NI-MZ for qemu-devel@nongnu.org; Fri, 16 Oct 2015 08:14:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zn3tY-0003Xo-B4 for qemu-devel@nongnu.org; Fri, 16 Oct 2015 08:14:04 -0400 Received: from mail-vk0-f41.google.com ([209.85.213.41]:34248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn3tY-0003Xd-7B for qemu-devel@nongnu.org; Fri, 16 Oct 2015 08:14:00 -0400 Received: by vkat63 with SMTP id t63so67036483vka.1 for ; Fri, 16 Oct 2015 05:13:59 -0700 (PDT) X-Received: by 10.31.56.72 with SMTP id f69mr9274831vka.27.1444997639678; Fri, 16 Oct 2015 05:13:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.153.15 with HTTP; Fri, 16 Oct 2015 05:13:40 -0700 (PDT) In-Reply-To: References: <1444445785-3648-1-git-send-email-crosthwaite.peter@gmail.com> From: Peter Maydell Date: Fri, 16 Oct 2015 13:13:40 +0100 Message-ID: To: Peter Crosthwaite X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.213.41 Cc: Peter Crosthwaite , QEMU Developers , Jean-Christophe Dubois Subject: Re: [Qemu-devel] [PATCH] arm: imx25-pdk: Fix machine name 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.169 as permitted sender) smtp.mailfrom=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 13 October 2015 at 18:18, Peter Maydell wrote: > On 10 October 2015 at 03:56, Peter Crosthwaite > wrote: >> ARM uses dashes instead of underscores for machine names. Fix imx25_pdk >> which has not seen a release yet (so there is no legacy yet). >> >> Cc: Jean-Christophe Dubois >> Signed-off-by: Peter Crosthwaite >> --- >> hw/arm/imx25_pdk.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c >> index 4250114..59a4c11 100644 >> --- a/hw/arm/imx25_pdk.c >> +++ b/hw/arm/imx25_pdk.c >> @@ -151,4 +151,4 @@ static void imx25_pdk_machine_init(MachineClass *mc) >> mc->init = imx25_pdk_init; >> } >> >> -DEFINE_MACHINE("imx25_pdk", imx25_pdk_machine_init) >> +DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) > Applied to target-arm.next, thanks. This patch breaks 'make check'. (tests/ds1338-test.c tries to start a machine "imx25_pdk" still). I have squashed in this fix: thanks -- PMM --- a/tests/ds1338-test.c +++ b/tests/ds1338-test.c @@ -61,7 +61,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - s = qtest_start("-display none -machine imx25_pdk"); + s = qtest_start("-display none -machine imx25-pdk"); i2c = imx_i2c_create(IMX25_I2C_0_BASE); addr = DS1338_ADDR;