66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
From c90d42e2acb6655508e37d42925dc6062d75f479 Mon Sep 17 00:00:00 2001
|
|
From: Alon Levy <alevy@redhat.com>
|
|
Date: Wed, 21 Mar 2012 17:55:23 +0200
|
|
Subject: [PATCH 1/4] server/red_memslots: drop two unused functions
|
|
|
|
cb_get_virt and cb_validate_virt have disappeared a long time ago,
|
|
not needed since:
|
|
|
|
commit 5ac88aa79fa6445f96e5419d8bf4fce81da63b90
|
|
Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Thu Jul 1 17:55:33 2010 +0200
|
|
|
|
Properly parse QXLImage to the new-world SpiceImage
|
|
|
|
SpiceImage now replaces RedImage and has all image types in it.
|
|
All image data are now chunked (and as such not copied when demarshalling).
|
|
---
|
|
server/red_memslots.c | 14 --------------
|
|
server/red_memslots.h | 5 -----
|
|
2 files changed, 19 deletions(-)
|
|
|
|
diff --git a/server/red_memslots.c b/server/red_memslots.c
|
|
index d98f38c..5057218 100644
|
|
--- a/server/red_memslots.c
|
|
+++ b/server/red_memslots.c
|
|
@@ -127,20 +127,6 @@ unsigned long get_virt(RedMemSlotInfo *info, unsigned long addr, uint32_t add_si
|
|
return h_virt;
|
|
}
|
|
|
|
-void *cb_get_virt(void *opaque, unsigned long addr,
|
|
- uint32_t add_size, uint32_t group_id)
|
|
-{
|
|
- return (void *)get_virt((RedMemSlotInfo *)opaque, addr, add_size, group_id);
|
|
-}
|
|
-
|
|
-void cb_validate_virt(void *opaque,
|
|
- unsigned long virt, unsigned long from_addr,
|
|
- uint32_t add_size, uint32_t group_id)
|
|
-{
|
|
- int slot_id = get_memslot_id((RedMemSlotInfo *)opaque, from_addr);
|
|
- validate_virt((RedMemSlotInfo *)opaque, virt, slot_id, add_size, group_id);
|
|
-}
|
|
-
|
|
void *validate_chunk (RedMemSlotInfo *info, QXLPHYSICAL data, uint32_t group_id, uint32_t *data_size_out, QXLPHYSICAL *next_out)
|
|
{
|
|
QXLDataChunk *chunk;
|
|
diff --git a/server/red_memslots.h b/server/red_memslots.h
|
|
index 18d5208..7aea0a3 100644
|
|
--- a/server/red_memslots.h
|
|
+++ b/server/red_memslots.h
|
|
@@ -60,11 +60,6 @@ unsigned long get_virt(RedMemSlotInfo *info, unsigned long addr, uint32_t add_si
|
|
int group_id);
|
|
|
|
void *validate_chunk (RedMemSlotInfo *info, QXLPHYSICAL data, uint32_t group_id, uint32_t *data_size_out, QXLPHYSICAL *next_out);
|
|
-void *cb_get_virt(void *opaque, unsigned long addr,
|
|
- uint32_t add_size, uint32_t group_id);
|
|
-void cb_validate_virt(void *opaque,
|
|
- unsigned long virt, unsigned long from_addr,
|
|
- uint32_t add_size, uint32_t group_id);
|
|
void red_memslot_info_init(RedMemSlotInfo *info,
|
|
uint32_t num_groups, uint32_t num_slots,
|
|
uint8_t generation_bits,
|
|
--
|
|
1.7.10
|
|
|