[Spice-devel] [spice-protocol PATCH 32/46] qxlhw: qxl.h: remove all mem_slot references from qxl_screen_t

[Alon Levy]

---
 src/qxl.h       |   10 ----------
 src/qxlhw_pci.c |    7 -------
 2 files changed, 17 deletions(-)

diff --git a/src/qxl.h b/src/qxl.h
index a386651..466b505 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -175,16 +175,6 @@ struct _qxl_screen_t
     
     ScrnInfoPtr			pScrn;
 
-    qxl_memslot_t *		mem_slots;
-    uint8_t			n_mem_slots;
-
-    uint8_t			main_mem_slot;
-    uint8_t			slot_id_bits;
-    uint8_t			slot_gen_bits;
-    uint64_t			va_slot_mask;
-
-    uint8_t			vram_mem_slot;
-
     surface_cache_t *		surface_cache;
 
     /* Evacuated surfaces are stored here during VT switches */
diff --git a/src/qxlhw_pci.c b/src/qxlhw_pci.c
index 9db7604..9c8387c 100644
--- a/src/qxlhw_pci.c
+++ b/src/qxlhw_pci.c
@@ -523,13 +523,6 @@ static void qxlhw_pci_reset(struct qxlhw *base)
     base->qxl->io_pages = hw->io_pages;
     base->qxl->io_pages_physical = hw->io_pages_physical;
 #endif
-    base->qxl->mem_slots = hw->mem_slots;
-    base->qxl->n_mem_slots = hw->n_mem_slots;
-    base->qxl->slot_gen_bits = hw->slot_gen_bits;
-    base->qxl->slot_id_bits = hw->slot_id_bits;
-    base->qxl->va_slot_mask = hw->va_slot_mask;
-    base->qxl->main_mem_slot = hw->main_mem_slot;
-    base->qxl->vram_mem_slot = hw->vram_mem_slot;
 }
 
 static void qxlhw_pci_save_state(struct qxlhw *base, ScrnInfoPtr pScrn)
-- 
1.7.9.3