From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stfop-0004ta-DQ for qemu-devel@nongnu.org; Tue, 24 Jul 2012 10:10:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stfok-0003y4-M0 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 10:10:35 -0400 From: Peter Maydell Date: Tue, 24 Jul 2012 15:10:27 +0100 Message-Id: <1343139027-23659-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] hw/escc: Drop duplicate definition of 'disabled' property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Blue Swirl , Alexander Graf , patches@linaro.org 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 --- 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