[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 4/8] virtio-balloon: use virtio wrappers to acces
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH v7 4/8] virtio-balloon: use virtio wrappers to access page frame numbers |
Date: |
Mon, 14 Apr 2014 14:02:19 +0200 |
User-agent: |
StGit/0.16 |
From: Rusty Russell <address@hidden>
This one can't get target independant because of TARGET_PAGE_SIZE.
Signed-off-by: Rusty Russell <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
[ pass VirtIODevice * to memory accessors,
Greg Kurz <address@hidden> ]
Signed-off-by: Greg Kurz <address@hidden>
---
hw/virtio/virtio-balloon.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index a470a0b..ba2e74e 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -30,6 +30,7 @@
#endif
#include "hw/virtio/virtio-bus.h"
+#include "hw/virtio/virtio-access.h"
static void balloon_page(void *addr, int deflate)
{
@@ -191,8 +192,9 @@ static void virtio_balloon_handle_output(VirtIODevice
*vdev, VirtQueue *vq)
while (iov_to_buf(elem.out_sg, elem.out_num, offset, &pfn, 4) == 4) {
ram_addr_t pa;
ram_addr_t addr;
+ int p = virtio_ldl_p(vdev, &pfn);
- pa = (ram_addr_t)ldl_p(&pfn) << VIRTIO_BALLOON_PFN_SHIFT;
+ pa = (ram_addr_t) p << VIRTIO_BALLOON_PFN_SHIFT;
offset += 4;
/* FIXME: remove get_system_memory(), but how? */
@@ -233,8 +235,8 @@ static void virtio_balloon_receive_stats(VirtIODevice
*vdev, VirtQueue *vq)
while (iov_to_buf(elem->out_sg, elem->out_num, offset, &stat, sizeof(stat))
== sizeof(stat)) {
- uint16_t tag = tswap16(stat.tag);
- uint64_t val = tswap64(stat.val);
+ uint16_t tag = virtio_tswap16(vdev, stat.tag);
+ uint64_t val = virtio_tswap64(vdev, stat.val);
offset += sizeof(stat);
if (tag < VIRTIO_BALLOON_S_NR)
[Qemu-devel] [PATCH v7 2/8] virtio: allow byte swapping for vring and config access, Greg Kurz, 2014/04/14
[Qemu-devel] [PATCH v7 3/8] virtio-net: use virtio wrappers to access headers, Greg Kurz, 2014/04/14
[Qemu-devel] [PATCH v7 4/8] virtio-balloon: use virtio wrappers to access page frame numbers,
Greg Kurz <=
[Qemu-devel] [PATCH v7 5/8] virtio-blk: use virtio wrappers to access headers, Greg Kurz, 2014/04/14
[Qemu-devel] [PATCH v7 6/8] virtio-scsi: use virtio wrappers to access headers, Greg Kurz, 2014/04/14
[Qemu-devel] [PATCH v7 7/8] virtio-serial-bus: use virtio wrappers to access headers, Greg Kurz, 2014/04/14
[Qemu-devel] [PATCH v7 8/8] virtio-9p: use virtio wrappers to access headers, Greg Kurz, 2014/04/14
[Qemu-devel] [PATCH v5] target-ppc: ppc64 target's virtio can be either endian, Greg Kurz, 2014/04/14