From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSV-0005Fq-US for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuSU-0006XD-SA for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:19 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:62691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSU-00064D-Iu for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:18 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so3616429iea.4 for ; Thu, 01 Nov 2012 06:05:18 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Thu, 1 Nov 2012 08:04:22 -0500 Message-Id: <1351775071-7644-21-git-send-email-mdroth@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [PATCH 20/29] pci_bridge: qidl_declare PCIBridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, blauwirbel@gmail.com, pbonzini@redhat.com Signed-off-by: Michael Roth --- hw/pci_bridge.c | 4 ++++ hw/pci_internals.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index 4680501..004f67c 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -32,6 +32,10 @@ #include "pci_bridge.h" #include "pci_internals.h" #include "range.h" +#include "qidl.h" + +QIDL_ENABLE() +QIDL_IMPLEMENT_PUBLIC(PCIBridge) /* PCI bridge subsystem vendor ID helper functions */ #define PCI_SSVID_SIZEOF 8 diff --git a/hw/pci_internals.h b/hw/pci_internals.h index bf40dc6..f22db18 100644 --- a/hw/pci_internals.h +++ b/hw/pci_internals.h @@ -55,11 +55,11 @@ struct PCIBridgeWindows { MemoryRegion alias_io; }; -struct PCIBridge { +QIDL_DECLARE_PUBLIC(PCIBridge) { PCIDevice dev; /* private member */ - PCIBus sec_bus; + PCIBus q_elsewhere sec_bus; /* * Memory regions for the bridge's address spaces. These regions are not * directly added to system_memory/system_io or its descendants. @@ -71,9 +71,9 @@ struct PCIBridge { MemoryRegion address_space_mem; MemoryRegion address_space_io; - PCIBridgeWindows *windows; + PCIBridgeWindows q_immutable *windows; - pci_map_irq_fn map_irq; + pci_map_irq_fn q_immutable map_irq; const char *bus_name; }; -- 1.7.9.5