From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya7jd-0000bY-BQ for qemu-devel@nongnu.org; Mon, 23 Mar 2015 15:10:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ya7jW-00032D-U2 for qemu-devel@nongnu.org; Mon, 23 Mar 2015 15:10:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya7jW-000313-P9 for qemu-devel@nongnu.org; Mon, 23 Mar 2015 15:09:54 -0400 From: Markus Armbruster Date: Mon, 23 Mar 2015 20:09:49 +0100 Message-Id: <1427137790-27265-3-git-send-email-armbru@redhat.com> In-Reply-To: <1427137790-27265-1-git-send-email-armbru@redhat.com> References: <1427137790-27265-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH for-2.3 2/3] sdhci: Make device "sdhci-pci" unavailable with -device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, pbonzini@redhat.com, peter.crosthwaite@xilinx.com, michael@walle.cc, edgar.iglesias@gmail.com Due to misuse of drive_get_next(), -device sdhci can connect to a -drive if=sd,... If you can't see what's wrong here, check out the FIXME in sdhci_initfn() and the commit that added it. We can't fix this in time for the release, but since the device is new in 2.3, we can disable it before this mistake becomes ABI: set cannot_instantiate_with_device_add_yet. Signed-off-by: Markus Armbruster --- hw/sd/sdhci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f056c52..ab13505 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1254,6 +1254,8 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd = &sdhci_vmstate; dc->props = sdhci_properties; + /* Reason: realize() method uses drive_get_next() */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo sdhci_pci_info = { -- 1.9.3