From patchwork Fri Dec 11 16:37:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 555814 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EC1211402D9 for ; Sat, 12 Dec 2015 03:37:39 +1100 (AEDT) Received: from localhost ([::1]:48413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7QhN-0007kA-S1 for incoming@patchwork.ozlabs.org; Fri, 11 Dec 2015 11:37:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7Qh7-0007S9-Kw for qemu-devel@nongnu.org; Fri, 11 Dec 2015 11:37:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a7Qh6-0006Qo-OV for qemu-devel@nongnu.org; Fri, 11 Dec 2015 11:37:21 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7Qh6-0006Pi-IR; Fri, 11 Dec 2015 11:37:20 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1a7Qgx-0001Id-9i; Fri, 11 Dec 2015 16:37:11 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 11 Dec 2015 16:37:02 +0000 Message-Id: <1449851831-4966-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1449851831-4966-1-git-send-email-peter.maydell@linaro.org> References: <1449851831-4966-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:8b0:1d0::1 Cc: Kevin O'Connor , Peter Crosthwaite , patches@linaro.org, Markus Armbruster , Alistair Francis , qemu-arm@nongnu.org, Paolo Bonzini , "Edgar E. Iglesias" Subject: [Qemu-devel] [PATCH 01/10] hw/sd/sdhci.c: Remove x-drive 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 The following commits will remove support for the old sdhci-pci command line syntax using the x-drive property: -device sdhci-pci,x-drive=mydrive -drive id=mydrive,[...] and replace it with an explicit sd device: -device sdhci-pci -drive id=mydrive,[...] -device sd,drive=mydrive (This is OK because x-drive is experimental.) This commit removes the x-drive property so that old style command lines will fail with a reasonable error message: -device sdhci-pci,x-drive=mydrive: Property '.x-drive' not found Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- hw/sd/sdhci.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 8612760..991c9b5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1221,12 +1221,6 @@ const VMStateDescription sdhci_vmstate = { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ static Property sdhci_pci_properties[] = { - /* - * We currently fuse controller and card into a single device - * model, but we intend to separate them. For that purpose, the - * properties that belong to the card are marked as experimental. - */ - DEFINE_PROP_DRIVE("x-drive", SDHCIState, blk), DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0),