[Spice-devel] [spice-protocol PATCH 45/46] qxlhw: qxlhw_pci_get_{ram, rom, ram_header} are now xspice only

Alon Levy alevy at redhat.com
Tue Apr 10 04:50:41 PDT 2012


Also some minor cleanup - make qxlhw_pci_get_ram_header for !xspice
---
 src/qxlhw_pci.c |    5 +++++
 src/qxlhw_pci.h |    2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/qxlhw_pci.c b/src/qxlhw_pci.c
index e1918c8..0d483fc 100644
--- a/src/qxlhw_pci.c
+++ b/src/qxlhw_pci.c
@@ -93,6 +93,9 @@ qxlhw_virtual_address (struct qxlhw_pci *hw, void *physical, uint8_t slot_id)
     return (void *)virt;
 }
 
+#ifndef XSPICE
+static
+#endif
 struct QXLRam *
 qxlhw_pci_get_ram_header (struct qxlhw *base)
 {
@@ -996,6 +999,7 @@ struct qxlhw *create_qxlhw_pci(qxl_screen_t *qxl, ScrnInfoPtr pScrn)
     return base;
 }
 
+#ifdef XSPICE
 struct QXLRom *qxlhw_pci_get_rom(struct qxlhw *base)
 {
     struct qxlhw_pci *hw = (struct qxlhw_pci *)base;
@@ -1009,3 +1013,4 @@ void *qxlhw_pci_get_ram(struct qxlhw *base)
 
     return hw->ram;
 }
+#endif
diff --git a/src/qxlhw_pci.h b/src/qxlhw_pci.h
index c2bddaa..4dbf4aa 100644
--- a/src/qxlhw_pci.h
+++ b/src/qxlhw_pci.h
@@ -13,9 +13,11 @@ struct qxlhw *create_qxlhw_pci(qxl_screen_t *qxl, ScrnInfoPtr pScrn);
 
 void qxlhw_pci_ioport_write(struct qxlhw_pci *hw, uint32_t io_port, uint32_t val);
 
+#ifdef XSPICE
 struct QXLRam *qxlhw_pci_get_ram_header(struct qxlhw *base);
 void *qxlhw_pci_get_ram(struct qxlhw *base);
 void *qxlhw_pci_get_vram(struct qxlhw *base);
 struct QXLRom *qxlhw_pci_get_rom(struct qxlhw *base);
+#endif
 
 #endif
-- 
1.7.9.3



More information about the Spice-devel mailing list