diff --git a/server/memslot.c b/server/memslot.c index 4d9d02ba..67eb9130 100644 --- a/server/memslot.c +++ b/server/memslot.c @@ -134,8 +134,7 @@ void *memslot_get_virt(RedMemSlotInfo *info, QXLPHYSICAL addr, uint32_t add_size void memslot_info_init(RedMemSlotInfo *info, uint32_t num_groups, uint32_t num_slots, uint8_t generation_bits, - uint8_t id_bits, - uint8_t internal_groupslot_id) + uint8_t id_bits) { uint32_t i; @@ -146,7 +145,6 @@ void memslot_info_init(RedMemSlotInfo *info, info->num_memslots = num_slots; info->generation_bits = generation_bits; info->mem_slot_bits = id_bits; - info->internal_groupslot_id = internal_groupslot_id; info->mem_slots = g_new(MemSlot *, num_groups); diff --git a/server/memslot.h b/server/memslot.h index 8586ab04..bfa24736 100644 --- a/server/memslot.h +++ b/server/memslot.h @@ -40,7 +40,6 @@ typedef struct RedMemSlotInfo { uint8_t generation_bits; uint8_t memslot_id_shift; uint8_t memslot_gen_shift; - uint8_t internal_groupslot_id; uintptr_t memslot_gen_mask; uintptr_t memslot_clean_virt_mask; } RedMemSlotInfo; @@ -66,8 +65,7 @@ void *memslot_get_virt(RedMemSlotInfo *info, QXLPHYSICAL addr, uint32_t add_size void memslot_info_init(RedMemSlotInfo *info, uint32_t num_groups, uint32_t num_slots, uint8_t generation_bits, - uint8_t id_bits, - uint8_t internal_groupslot_id); + uint8_t id_bits); void memslot_info_destroy(RedMemSlotInfo *info); void memslot_info_add_slot(RedMemSlotInfo *info, uint32_t slot_group_id, uint32_t slot_id, uintptr_t addr_delta, uintptr_t virt_start, uintptr_t virt_end, diff --git a/server/red-worker.cpp b/server/red-worker.cpp index 3880531b..76589da2 100644 --- a/server/red-worker.cpp +++ b/server/red-worker.cpp @@ -976,8 +976,7 @@ RedWorker* red_worker_new(QXLInstance *qxl) init_info.num_memslots_groups, init_info.num_memslots, init_info.memslot_gen_bits, - init_info.memslot_id_bits, - init_info.internal_groupslot_id); + init_info.memslot_id_bits); worker->event_timeout = INF_EVENT_WAIT; diff --git a/server/tests/test-qxl-parsing.cpp b/server/tests/test-qxl-parsing.cpp index d68879f1..86baf76a 100644 --- a/server/tests/test-qxl-parsing.cpp +++ b/server/tests/test-qxl-parsing.cpp @@ -58,7 +58,7 @@ create_chunk(size_t prefix, uint32_t size, QXLDataChunk* prev, int fill) static void init_meminfo(RedMemSlotInfo *mem_info) { - memslot_info_init(mem_info, 1 /* groups */, 1 /* slots */, 1, 1, 0); + memslot_info_init(mem_info, 1 /* groups */, 1 /* slots */, 1, 1); memslot_info_add_slot(mem_info, 0, 0, 0 /* delta */, 0 /* start */, UINTPTR_MAX /* end */, 0 /* generation */); }