From patchwork Fri Oct 16 13:58:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 55108 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f70.google.com (mail-lf0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id 6029622EAC for ; Fri, 16 Oct 2015 13:59:29 +0000 (UTC) Received: by lfbe131 with SMTP id e131sf18337213lfb.3 for ; Fri, 16 Oct 2015 06:59:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references: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=8HT2pWr5+sTZFGmvRI+GH3eMbdPaOw1zajTe30AtzfE=; b=IbzYLx5ZcuLGMtUj4t/v7lKq6j9bjUEwjrKB6eN/pVr6uZPdM7wWvKaj4DGGBLjSNM eTp/NTcQtE8NBYNpwVK2gqkpSw3ky3W4qRP30eSPKCvDUFIh1uxb4habxkRqqKsq57K0 P5BvhsyDhcNQ9oZvHidSLrtPcBCTEV0x+URUJKXqDUgMbL4Swc/IkM2Koh/bngTvGdGc fa80ZA2ZCYHrGpj6zknpu8ipw0ikm/ztIVP8z2r6hB4pP0qsuqxy5hAK5KrGLSbh2jm4 y0u5dTYGMzMS8ge1ni5sutBrN7SL2x7+hHmVu2WK5KOH9bd8rTUldqdw+CWCzP0FLQAl 9lxw== X-Gm-Message-State: ALoCoQnhELCm3L7tW8hv+phQTZcvKrKiIGpi0E105vEQVppy52vNUFY1FjDsjSAnKyqIbBWrfryk X-Received: by 10.112.136.99 with SMTP id pz3mr3680924lbb.11.1445003968324; Fri, 16 Oct 2015 06:59:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.15.106 with SMTP id e103ls120110lfi.14.gmail; Fri, 16 Oct 2015 06:59:28 -0700 (PDT) X-Received: by 10.112.134.102 with SMTP id pj6mr8513103lbb.14.1445003968187; Fri, 16 Oct 2015 06:59:28 -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 17si12989237lfz.148.2015.10.16.06.59.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 06:59:28 -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 lbbes7 with SMTP id es7so11435932lbb.2 for ; Fri, 16 Oct 2015 06:59:28 -0700 (PDT) X-Received: by 10.112.129.202 with SMTP id ny10mr8259645lbb.112.1445003968076; Fri, 16 Oct 2015 06:59:28 -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 w3csp1307807lbq; Fri, 16 Oct 2015 06:59:27 -0700 (PDT) X-Received: by 10.55.203.16 with SMTP id d16mr19248196qkj.51.1445003965239; Fri, 16 Oct 2015 06:59:25 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m9si18001712qhb.16.2015.10.16.06.59.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 Oct 2015 06:59:25 -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]:53829 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn5XY-0003Bi-PS for patch@linaro.org; Fri, 16 Oct 2015 09:59:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn5WO-000212-O5 for qemu-devel@nongnu.org; Fri, 16 Oct 2015 09:58:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zn5WN-0000lp-1q for qemu-devel@nongnu.org; Fri, 16 Oct 2015 09:58:12 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:35158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn5WM-0000ht-RL for qemu-devel@nongnu.org; Fri, 16 Oct 2015 09:58:10 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Zn5WJ-0003mU-Ro for qemu-devel@nongnu.org; Fri, 16 Oct 2015 14:58:07 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 16 Oct 2015 14:58:01 +0100 Message-Id: <1445003887-14475-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1445003887-14475-1-git-send-email-peter.maydell@linaro.org> References: <1445003887-14475-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 07/13] 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.170 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 From: Peter Crosthwaite 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 Message-id: 1444445785-3648-1-git-send-email-crosthwaite.peter@gmail.com Reviewed-by: Peter Maydell [PMM: Added change to tests/ds1338-test.c to use new machine name] Signed-off-by: Peter Maydell --- hw/arm/imx25_pdk.c | 2 +- tests/ds1338-test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) diff --git a/tests/ds1338-test.c b/tests/ds1338-test.c index a7fb415..7d513d8 100644 --- 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;