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: 10227 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3EFE824027 for ; Tue, 24 Jul 2012 14:10:33 +0000 (UTC) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id F274EA188E3 for ; Tue, 24 Jul 2012 14:10:32 +0000 (UTC) Received: by vcbfw7 with SMTP id fw7so6199192vcb.11 for ; Tue, 24 Jul 2012 07:10:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=lDHSxArF0VXWPGM70X59oRG+jJOfdBpu3YlY3H3crJc=; b=gvrE6NwM+zaHhMtLgZoOlsvV7wkpPbY6VdisXzleAnVXXnYoOfjTifo8aW/Dquspqd qxN0MqWfktdBIIcfZwGH7MA2feEFJiseYSiTu++bgpvvFAVHHMRcLGIwCuu6iNjx3lxK DCaiehN22qMMW5vFCQexWqqzifeZ3z+xBkNiLRiFL+/MJSL/BMz1mBZB9I6vwOlWjgM9 LTKhgiA403gDkwC3r1PVakKxzu2tQcI9o4QJL5ts6kW+ajnbSHc3nPt+0ZfmYPOO9GSy 9yNSXttrNTsbxXbsTwdIRU7wMHdgkVfAosiYYXp4wIpLKj6hGO9yrzsSiDLSb0wENXDR XMjA== Received: by 10.42.155.200 with SMTP id v8mr15506704icw.12.1343139032241; Tue, 24 Jul 2012 07:10:32 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.153.7 with SMTP id i7csp73986ibw; Tue, 24 Jul 2012 07:10:30 -0700 (PDT) Received: by 10.216.136.95 with SMTP id v73mr9743374wei.2.1343139030234; Tue, 24 Jul 2012 07:10:30 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id v15si20421928wem.76.2012.07.24.07.10.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 07:10:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk 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 Cc: patches@linaro.org, qemu-trivial@nongnu.org, Alexander Graf , Blue Swirl Subject: [PATCH] hw/escc: Drop duplicate definition of 'disabled' property 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-Gm-Message-State: ALoCoQnHX+jm/bejePhlVesqg+9foH+4utlKR3BMxN7y2LdKjlaU2jhh7dnQ1GK9phgR/93LOZnM 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),