[Spice-commits] server/memslot.c server/memslot.h server/tests

[Frediano Ziglio]

 server/memslot.c                |   10 ++++++++++
 server/memslot.h                |    1 +
 server/tests/test-qxl-parsing.c |    3 +--
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit f275733de30f6ed4f4cd546031008c9f9a7f11f2
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Oct 14 13:19:03 2015 +0100

    Add a red_memslot_info_destroy function
    
    Allows to free RedMemSlotInfo structure
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/server/memslot.c b/server/memslot.c
index 75cb75f..fdcd023 100644
--- a/server/memslot.c
+++ b/server/memslot.c
@@ -166,6 +166,16 @@ void memslot_info_init(RedMemSlotInfo *info,
                                        (info->mem_slot_bits + info->generation_bits));
 }
 
+void memslot_info_destroy(RedMemSlotInfo *info)
+{
+    uint32_t i;
+
+    for (i = 0; i < info->num_memslots_groups; ++i) {
+        free(info->mem_slots[i]);
+    }
+    free(info->mem_slots);
+}
+
 void memslot_info_add_slot(RedMemSlotInfo *info, uint32_t slot_group_id, uint32_t slot_id,
                            uint64_t addr_delta, unsigned long virt_start, unsigned long virt_end,
                            uint32_t generation)
diff --git a/server/memslot.h b/server/memslot.h
index 5046d0f..71f1210 100644
--- a/server/memslot.h
+++ b/server/memslot.h
@@ -66,6 +66,7 @@ void memslot_info_init(RedMemSlotInfo *info,
                        uint8_t generation_bits,
                        uint8_t id_bits,
                        uint8_t internal_groupslot_id);
+void memslot_info_destroy(RedMemSlotInfo *info);
 void memslot_info_add_slot(RedMemSlotInfo *info, uint32_t slot_group_id, uint32_t slot_id,
                            uint64_t addr_delta, unsigned long virt_start, unsigned long virt_end,
                            uint32_t generation);
diff --git a/server/tests/test-qxl-parsing.c b/server/tests/test-qxl-parsing.c
index db486c1..dd99150 100644
--- a/server/tests/test-qxl-parsing.c
+++ b/server/tests/test-qxl-parsing.c
@@ -197,8 +197,7 @@ int main(int argc, char **argv)
     free(cursor);
     free(chunks[0]);
 
-    free(mem_info.mem_slots[0]);
-    free(mem_info.mem_slots);
+    memslot_info_destroy(&mem_info);
     free(surface_mem);
 
     return exit_code;