Patchwork [20/29] pci_bridge: qidl_declare PCIBridge

login
register
mail settings
Submitter Michael Roth
Date Nov. 1, 2012, 1:04 p.m.
Message ID <1351775071-7644-21-git-send-email-mdroth@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/196249/
State New
Headers show

Comments

Michael Roth - Nov. 1, 2012, 1:04 p.m.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 hw/pci_bridge.c    |    4 ++++
 hw/pci_internals.h |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

Patch

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;
 };