From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4r1e-0005H0-UU for qemu-devel@nongnu.org; Fri, 04 Dec 2015 09:07:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4r1b-0006AW-In for qemu-devel@nongnu.org; Fri, 04 Dec 2015 09:07:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4r1b-0006AE-Dd for qemu-devel@nongnu.org; Fri, 04 Dec 2015 09:07:51 -0500 From: Markus Armbruster Date: Fri, 4 Dec 2015 15:07:47 +0100 Message-Id: <1449238067-29794-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] sdhci: Make device "sdhci-pci" unavailable with -device again List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, kevin@koconnor.net, stefanha@redhat.com We made it unavailable in commit 1910913 because its use of drive_get_next() instead of a property. Commit 5ec911c replaced drive_get_next() and made the device available, but the property isn't quite right, and the code dangerously ignores blk_attach_dev() failure. Disable it again before the property becomes ABI, and mark the dangerous spot FIXME. Signed-off-by: Markus Armbruster --- hw/sd/sd.c | 1 + hw/sd/sdhci.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index ce4d44b..d0be5ea 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -494,6 +494,7 @@ SDState *sd_init(BlockBackend *blk, bool is_spi) if (sd->blk) { /* Attach dev if not already attached. (This call ignores an * error return code if sd->blk is already attached.) */ + /* FIXME ignoring blk_attach_dev() failure is wrong and dangerous */ blk_attach_dev(sd->blk, sd); blk_set_dev_ops(sd->blk, &sd_block_ops, sd); } diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index d70d1a6..0a338ed 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1261,6 +1261,12 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd = &sdhci_vmstate; dc->props = sdhci_pci_properties; + /* + * Reason: realize() method uses sd_init(), which ignores + * blk_attach_dev() failure (potentially dangerous), and the block + * properties really belong to the card, not the controller. + */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo sdhci_pci_info = { -- 2.4.3