[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/11] xen: remove qemu_map_cache_unlock
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 04/11] xen: remove qemu_map_cache_unlock |
Date: |
Sun, 19 Jun 2011 05:39:43 +0200 |
From: Stefano Stabellini <address@hidden>
There is no need for qemu_map_cache_unlock, just use
qemu_invalidate_entry instead.
Signed-off-by: Stefano Stabellini <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
exec.c | 2 +-
xen-mapcache-stub.c | 4 ----
xen-mapcache.c | 33 ---------------------------------
xen-mapcache.h | 1 -
4 files changed, 1 insertions(+), 39 deletions(-)
diff --git a/exec.c b/exec.c
index 09928a3..01f33bb 100644
--- a/exec.c
+++ b/exec.c
@@ -3146,7 +3146,7 @@ void qemu_put_ram_ptr(void *addr)
xen_unmap_block(block->host, block->length);
block->host = NULL;
} else {
- qemu_map_cache_unlock(addr);
+ qemu_invalidate_entry(addr);
}
}
}
diff --git a/xen-mapcache-stub.c b/xen-mapcache-stub.c
index 7c14b3d..60f712b 100644
--- a/xen-mapcache-stub.c
+++ b/xen-mapcache-stub.c
@@ -22,10 +22,6 @@ uint8_t *qemu_map_cache(target_phys_addr_t phys_addr,
target_phys_addr_t size, u
return qemu_get_ram_ptr(phys_addr);
}
-void qemu_map_cache_unlock(void *buffer)
-{
-}
-
ram_addr_t qemu_ram_addr_from_mapcache(void *ptr)
{
return -1;
diff --git a/xen-mapcache.c b/xen-mapcache.c
index 90fbd49..57fe24d 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -230,39 +230,6 @@ uint8_t *qemu_map_cache(target_phys_addr_t phys_addr,
target_phys_addr_t size, u
return mapcache->last_address_vaddr + address_offset;
}
-void qemu_map_cache_unlock(void *buffer)
-{
- MapCacheEntry *entry = NULL, *pentry = NULL;
- MapCacheRev *reventry;
- target_phys_addr_t paddr_index;
- int found = 0;
-
- QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
- if (reventry->vaddr_req == buffer) {
- paddr_index = reventry->paddr_index;
- found = 1;
- break;
- }
- }
- if (!found) {
- return;
- }
- QTAILQ_REMOVE(&mapcache->locked_entries, reventry, next);
- qemu_free(reventry);
-
- entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
- while (entry && entry->paddr_index != paddr_index) {
- pentry = entry;
- entry = entry->next;
- }
- if (!entry) {
- return;
- }
- if (entry->lock > 0) {
- entry->lock--;
- }
-}
-
ram_addr_t qemu_ram_addr_from_mapcache(void *ptr)
{
MapCacheEntry *entry = NULL, *pentry = NULL;
diff --git a/xen-mapcache.h b/xen-mapcache.h
index 339444c..b89b8f9 100644
--- a/xen-mapcache.h
+++ b/xen-mapcache.h
@@ -14,7 +14,6 @@
void qemu_map_cache_init(void);
uint8_t *qemu_map_cache(target_phys_addr_t phys_addr, target_phys_addr_t
size, uint8_t lock);
-void qemu_map_cache_unlock(void *phys_addr);
ram_addr_t qemu_ram_addr_from_mapcache(void *ptr);
void qemu_invalidate_entry(uint8_t *buffer);
void qemu_invalidate_map_cache(void);
--
1.6.0.2
- [Qemu-devel] [PATCH 02/11] xen: Introduce VGA sync dirty bitmap support, (continued)
- [Qemu-devel] [PATCH 02/11] xen: Introduce VGA sync dirty bitmap support, Alexander Graf, 2011/06/20
- [Qemu-devel] [PATCH 07/11] xen: mapcache performance improvements, Alexander Graf, 2011/06/20
- [Qemu-devel] [PATCH 01/11] xen: Add xc_domain_add_to_physmap to xen_interface., Alexander Graf, 2011/06/20
- [Qemu-devel] [PATCH 08/11] cirrus_vga: reset lfb_addr after a pci config write if the BAR is unmapped, Alexander Graf, 2011/06/20
- [Qemu-devel] [PATCH 06/11] exec.c: refactor cpu_physical_memory_map, Alexander Graf, 2011/06/20
[Qemu-devel] [PATCH 05/11] xen: remove xen_map_block and xen_unmap_block, Alexander Graf, 2011/06/20
[Qemu-devel] [PATCH 04/11] xen: remove qemu_map_cache_unlock,
Alexander Graf <=
[Qemu-devel] [PATCH 03/11] xen: fix qemu_map_cache with size != MCACHE_BUCKET_SIZE, Alexander Graf, 2011/06/20
Re: [Qemu-devel] [PULL] Xen Patch Queue, Anthony Liguori, 2011/06/22