From patchwork Thu Nov 1 13:04:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 196229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A4D6E2C00DB for ; Fri, 2 Nov 2012 01:34:46 +1100 (EST) Received: from localhost ([::1]:48219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTvr2-0002oT-Pf for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 10:34:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSe-0005GN-RN for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuSd-0006bH-NC for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:28 -0400 Received: from mail-ia0-f173.google.com ([209.85.210.173]:60542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSd-000627-FN for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:27 -0400 Received: by mail-ia0-f173.google.com with SMTP id m10so1965034iam.4 for ; Thu, 01 Nov 2012 06:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=kmHtOiF4WNMdiXsiA8IP0McbKsR6lttGfuATgz8Kh08=; b=JnMDOCasb5U+lHBc8bjjs8KngXaMdIQmvsKwsncw5ljxwFiGoorAYxIvDrS0kKgk9x IkY4pnUnFEVTpUNGLXE7tgal+FBgnBLs0fYubCGuBxp2kyrzxfNHUN0egx6Ss0sC8DnP 5h5AUcidkjXj107TjdJBo17GvgiQmYkAyFvBwRbpOl5qRRWdAadZfbfyUBcMn0WaUcn/ n3N4a30QOnXqNoQmbN+dMSBgIa994UVkhblqM/FnkfR/BlOo8+tsk3uSojOTbKM8A4b9 c2+lBHGE/WA2n4JWhTgMcTXB9d5atSWt0BTeWY3NhCCCzzjGt+mHW6p4swDD6xo/C/bc ifZA== Received: by 10.50.42.197 with SMTP id q5mr1132814igl.21.1351775127191; Thu, 01 Nov 2012 06:05:27 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id dq9sm5734584igc.5.2012.11.01.06.05.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 06:05:26 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 1 Nov 2012 08:04:28 -0500 Message-Id: <1351775071-7644-27-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 26/29] ide: qidl_declare BMDMAState + PCIIDEState 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 Signed-off-by: Michael Roth --- hw/ide/pci.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hw/ide/pci.h b/hw/ide/pci.h index a694e54..b54ea26 100644 --- a/hw/ide/pci.h +++ b/hw/ide/pci.h @@ -2,33 +2,36 @@ #define HW_IDE_PCI_H #include +#include "qidl.h" -typedef struct BMDMAState { - IDEDMA dma; +typedef struct BMDMAState BMDMAState; + +QIDL_DECLARE_PUBLIC(BMDMAState) { + IDEDMA q_immutable dma; uint8_t cmd; uint8_t status; uint32_t addr; - IDEBus *bus; + IDEBus q_elsewhere *bus; /* via parent's corresponding bus */ /* current transfer state */ uint32_t cur_addr; uint32_t cur_prd_last; uint32_t cur_prd_addr; uint32_t cur_prd_len; uint8_t unit; - BlockDriverCompletionFunc *dma_cb; + BlockDriverCompletionFunc q_immutable *dma_cb; int64_t sector_num; uint32_t nsector; MemoryRegion addr_ioport; MemoryRegion extra_io; - QEMUBH *bh; + QEMUBH q_immutable *bh; qemu_irq irq; /* Bit 0-2 and 7: BM status register * Bit 3-6: bus->error_status */ uint8_t migration_compat_status; - struct PCIIDEState *pci_dev; -} BMDMAState; + struct PCIIDEState q_elsewhere *pci_dev; /* via parent */ +}; typedef struct CMD646BAR { MemoryRegion cmd; @@ -37,15 +40,16 @@ typedef struct CMD646BAR { struct PCIIDEState *pci_dev; } CMD646BAR; -typedef struct PCIIDEState { +typedef struct PCIIDEState PCIIDEState; + +QIDL_DECLARE_PUBLIC(PCIIDEState) { PCIDevice dev; IDEBus bus[2]; BMDMAState bmdma[2]; - uint32_t secondary; /* used only for cmd646 */ + uint32_t q_immutable secondary; /* used only for cmd646 */ MemoryRegion bmdma_bar; - CMD646BAR cmd646_bar[2]; /* used only for cmd646 */ -} PCIIDEState; - + CMD646BAR q_immutable cmd646_bar[2]; /* used only for cmd646 */ +}; static inline IDEState *bmdma_active_if(BMDMAState *bmdma) {