ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-balloon: avoid cpu_get_physical_page_desc() 

This reaches into the innards of the memory core, which are being
changed.  Switch to a memory API version.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-12-19 13:18:13 +02:00
parent 2817b260e3
commit b7c28c74af
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/virtio-balloon.c
View File

@ -21,6 +21,7 @@
#include "balloon.h" #include "balloon.h"
#include "virtio-balloon.h" #include "virtio-balloon.h"
#include "kvm.h" #include "kvm.h"
#include "exec-memory.h"
#if defined(__linux__) #if defined(__linux__)
#include <sys/mman.h> #include <sys/mman.h>
@ -70,6 +71,7 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq)
{ {
VirtIOBalloon *s = to_virtio_balloon(vdev); VirtIOBalloon *s = to_virtio_balloon(vdev);
VirtQueueElement elem; VirtQueueElement elem;
MemoryRegionSection section;
while (virtqueue_pop(vq, &elem)) { while (virtqueue_pop(vq, &elem)) {
size_t offset = 0; size_t offset = 0;
@ -82,13 +84,16 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq)
pa = (ram_addr_t)ldl_p(&pfn) << VIRTIO_BALLOON_PFN_SHIFT; pa = (ram_addr_t)ldl_p(&pfn) << VIRTIO_BALLOON_PFN_SHIFT;
offset += 4; offset += 4;
addr = cpu_get_physical_page_desc(pa); /* FIXME: remove get_system_memory(), but how? */
if ((addr & ~TARGET_PAGE_MASK) != IO_MEM_RAM) section = memory_region_find(get_system_memory(), pa, 1);
if (!section.size || !memory_region_is_ram(section.mr))
continue; 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. */ should be OK because we only want a single page. */
balloon_page(qemu_get_ram_ptr(addr), !!(vq == s->dvq)); addr = section.offset_within_region;
balloon_page(memory_region_get_ram_ptr(section.mr) + addr,
!!(vq == s->dvq));
} }
virtqueue_push(vq, &elem, offset); virtqueue_push(vq, &elem, offset);