* [Qemu-devel] [PATCH] arm: imx25-pdk: Fix machine name
@ 2015-10-10 2:56 Peter Crosthwaite
2015-10-13 17:18 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Peter Crosthwaite @ 2015-10-10 2:56 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Peter Crosthwaite, jcd
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 <jcd@tribudubois.net>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
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)
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] arm: imx25-pdk: Fix machine name
2015-10-10 2:56 [Qemu-devel] [PATCH] arm: imx25-pdk: Fix machine name Peter Crosthwaite
@ 2015-10-13 17:18 ` Peter Maydell
2015-10-16 12:13 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2015-10-13 17:18 UTC (permalink / raw)
To: Peter Crosthwaite
Cc: Peter Crosthwaite, QEMU Developers, Jean-Christophe Dubois
On 10 October 2015 at 03:56, Peter Crosthwaite
<crosthwaitepeter@gmail.com> 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 <jcd@tribudubois.net>
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
> 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)
> --
> 1.9.1
>
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] arm: imx25-pdk: Fix machine name
2015-10-13 17:18 ` Peter Maydell
@ 2015-10-16 12:13 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2015-10-16 12:13 UTC (permalink / raw)
To: Peter Crosthwaite
Cc: Peter Crosthwaite, QEMU Developers, Jean-Christophe Dubois
On 13 October 2015 at 18:18, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 10 October 2015 at 03:56, Peter Crosthwaite
> <crosthwaitepeter@gmail.com> 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 <jcd@tribudubois.net>
>> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
>> ---
>> 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:
--- 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;
thanks
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-16 12:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-10 2:56 [Qemu-devel] [PATCH] arm: imx25-pdk: Fix machine name Peter Crosthwaite
2015-10-13 17:18 ` Peter Maydell
2015-10-16 12:13 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).