From patchwork Tue Jul 24 14:10:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 172885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 087362C0086 for ; Wed, 25 Jul 2012 00:10:48 +1000 (EST) Received: from localhost ([::1]:45511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stfp0-0004tn-2P for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 10:10:46 -0400 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 Received: from mnementh.archaic.org.uk ([81.2.115.146]:50777) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stfok-0003xr-FK; Tue, 24 Jul 2012 10:10:30 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Stfoh-0006A2-Fq; Tue, 24 Jul 2012 15:10:27 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 15:10:27 +0100 Message-Id: <1343139027-23659-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: qemu-trivial@nongnu.org, Blue Swirl , Alexander Graf , patches@linaro.org Subject: [Qemu-devel] [PATCH] hw/escc: Drop duplicate definition of 'disabled' property 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 Acked-by: Andreas Färber --- 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),