[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/23] virtio-balloon: avoid cpu_get_physical_page_d
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 21/23] virtio-balloon: avoid cpu_get_physical_page_desc() |
Date: |
Mon, 19 Dec 2011 16:13:42 +0200 |
This reaches into the innards of the memory core, which are being
changed. Switch to a memory API version.
Signed-off-by: Avi Kivity <address@hidden>
---
hw/virtio-balloon.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index e24a2bf..bb4a8dd 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -21,6 +21,7 @@
#include "balloon.h"
#include "virtio-balloon.h"
#include "kvm.h"
+#include "exec-memory.h"
#if defined(__linux__)
#include <sys/mman.h>
@@ -70,6 +71,7 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev,
VirtQueue *vq)
{
VirtIOBalloon *s = to_virtio_balloon(vdev);
VirtQueueElement elem;
+ MemoryRegionSection section;
while (virtqueue_pop(vq, &elem)) {
size_t offset = 0;
@@ -82,13 +84,17 @@ static void virtio_balloon_handle_output(VirtIODevice
*vdev, VirtQueue *vq)
pa = (ram_addr_t)ldl_p(&pfn) << VIRTIO_BALLOON_PFN_SHIFT;
offset += 4;
- addr = cpu_get_physical_page_desc(pa);
- if ((addr & ~TARGET_PAGE_MASK) != IO_MEM_RAM)
+ /* FIXME: remove get_system_memory(), but how? */
+ section = memory_region_find(get_system_memory(), pa, 1);
+ if (!section.mr || !memory_region_is_ram(section.mr))
continue;
- /* Using qemu_get_ram_ptr is bending the rules a bit, but
+ /* Using memory_region_get_ram_ptr is bending the rules a bit, but
should be OK because we only want a single page. */
- balloon_page(qemu_get_ram_ptr(addr), !!(vq == s->dvq));
+ addr -= section.offset_within_address_space;
+ addr += section.offset_within_region;
+ balloon_page(memory_region_get_ram_ptr(section.mr) + addr,
+ !!(vq == s->dvq));
}
virtqueue_push(vq, &elem, offset);
--
1.7.7.1
- Re: [Qemu-devel] [PATCH 01/23] memory: introduce memory_region_find(), (continued)
[Qemu-devel] [PATCH 17/23] xen: convert to MemoryListener API, Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 14/23] vhost: convert to MemoryListener API, Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 21/23] virtio-balloon: avoid cpu_get_physical_page_desc(),
Avi Kivity <=
[Qemu-devel] [PATCH 07/23] framebuffer: drop use of cpu_physical_sync_dirty_bitmap(), Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 02/23] sysbus: add sysbus_address_space(), Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 23/23] Remove cpu_get_physical_page_desc(), Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 22/23] sparc: avoid cpu_get_physical_page_desc(), Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 13/23] kvm: convert to MemoryListener API, Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 08/23] memory: replace cpu_physical_sync_dirty_bitmap() with a memory API, Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 18/23] memory: remove CPUPhysMemoryClient, Avi Kivity, 2011/12/19
[Qemu-devel] [PATCH 10/23] memory: add memory_region_is_logging(), Avi Kivity, 2011/12/19
Re: [Qemu-devel] [PATCH 00/23] Remove cpu_get_physical_page_desc(), Anthony Liguori, 2011/12/19