[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [PATCH] hw/escc: Drop duplicate definition of 'disabl
From: |
Blue Swirl |
Subject: |
Re: [Qemu-trivial] [PATCH] hw/escc: Drop duplicate definition of 'disabled' property |
Date: |
Sat, 28 Jul 2012 12:16:56 +0000 |
Thanks, applied.
On Tue, Jul 24, 2012 at 2:10 PM, Peter Maydell <address@hidden> wrote:
> Drop a duplicate definition of the 'disabled' property from
> the escc qdev property list: this redefinition is currently
> effectively ignored but will become an error. (The duplication
> was inadvertently introduced in 2009 in commit ec02f7dec2.)
>
> Signed-off-by: Peter Maydell <address@hidden>
> ---
> Other than the armv7m_nvic, this is the only other case of an
> attempt to set a duplicate property that I could find in my
> "start every machine QEMU implements" test...
>
> hw/escc.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/hw/escc.c b/hw/escc.c
> index 4d8a8e8..e1f5e73 100644
> --- a/hw/escc.c
> +++ b/hw/escc.c
> @@ -905,7 +905,6 @@ static Property escc_properties[] = {
> DEFINE_PROP_UINT32("frequency", SerialState, frequency, 0),
> DEFINE_PROP_UINT32("it_shift", SerialState, it_shift, 0),
> DEFINE_PROP_UINT32("disabled", SerialState, disabled, 0),
> - DEFINE_PROP_UINT32("disabled", SerialState, disabled, 0),
> DEFINE_PROP_UINT32("chnBtype", SerialState, chn[0].type, 0),
> DEFINE_PROP_UINT32("chnAtype", SerialState, chn[1].type, 0),
> DEFINE_PROP_CHR("chrB", SerialState, chn[0].chr),
> --
> 1.7.5.4
>