From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5y8E-00029U-Qh for qemu-devel@nongnu.org; Mon, 07 Dec 2015 10:55:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a5y89-0006kj-PU for qemu-devel@nongnu.org; Mon, 07 Dec 2015 10:55:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a5y89-0006kG-Kb for qemu-devel@nongnu.org; Mon, 07 Dec 2015 10:55:13 -0500 From: Markus Armbruster Date: Mon, 7 Dec 2015 16:55:09 +0100 Message-Id: <1449503710-3707-2-git-send-email-armbru@redhat.com> In-Reply-To: <1449503710-3707-1-git-send-email-armbru@redhat.com> References: <1449503710-3707-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH for-2.5 1/2] sdhci: Sanitize "sdhci-pci" properties for future qomification List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, crosthwaite.peter@gmail.com, kevin@koconnor.net, stefanha@redhat.com, pbonzini@redhat.com We currently fuse controller and card into a single device model, but we intend qomify things properly and separate the two. The properties that really belong to the card would then have to somehow pass-through to the card's properties. To avoid that complication, either mark them experimental or drop them. Properties "capareg", "maxcurr" and the usual PCI device properties belong to the controller. Property "drive" belongs to the card; rename it to "x-drive". Properties "logical_block_size", "physical_block_size", "min_io_size", "opt_io_size", "discard_granularity" belong to the card, but have no effect; drop them. Signed-off-by: Markus Armbruster --- hw/sd/sdhci.c | 9 +++++++-- include/hw/sd/sdhci.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index d70d1a6..8612760 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1221,7 +1221,12 @@ const VMStateDescription sdhci_vmstate = { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ static Property sdhci_pci_properties[] = { - DEFINE_BLOCK_PROPERTIES(SDHCIState, conf), + /* + * 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), @@ -1233,7 +1238,7 @@ static void sdhci_pci_realize(PCIDevice *dev, Error **errp) SDHCIState *s = PCI_SDHCI(dev); dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */ dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */ - sdhci_initfn(s, s->conf.blk); + sdhci_initfn(s, s->blk); s->buf_maxsz = sdhci_get_fifolen(s); s->fifo_buffer = g_malloc0(s->buf_maxsz); s->irq = pci_allocate_irq(dev); diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 9b3031f..e78d938 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -39,7 +39,7 @@ typedef struct SDHCIState { }; SDState *card; MemoryRegion iomem; - BlockConf conf; + BlockBackend *blk; QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; -- 2.4.3