[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 15/20] virtio-balloon: use virtio wrappers to acc
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH v8 15/20] virtio-balloon: use virtio wrappers to access page frame numbers |
Date: |
Fri, 13 Jun 2014 13:24:38 +0200 |
User-agent: |
StGit/0.17-dirty |
From: Rusty Russell <address@hidden>
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 84d1733..cbd53cf 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)
{
@@ -205,8 +206,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? */
@@ -247,8 +249,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)
- Re: [Qemu-devel] [PATCH v8 11/20] virtio: add endian-ambivalent support to VirtIODevice, (continued)
[Qemu-devel] [PATCH v8 12/20] virtio: memory accessors for endian-ambivalent targets, Greg Kurz, 2014/06/13
[Qemu-devel] [PATCH v8 13/20] virtio: allow byte swapping for vring, Greg Kurz, 2014/06/13
[Qemu-devel] [PATCH v8 14/20] virtio-net: use virtio wrappers to access headers, Greg Kurz, 2014/06/13
[Qemu-devel] [PATCH v8 15/20] virtio-balloon: use virtio wrappers to access page frame numbers,
Greg Kurz <=
[Qemu-devel] [PATCH v8 16/20] virtio-blk: use virtio wrappers to access headers, Greg Kurz, 2014/06/13
[Qemu-devel] [PATCH v8 17/20] virtio-scsi: use virtio wrappers to access headers, Greg Kurz, 2014/06/13
[Qemu-devel] [PATCH v8 18/20] virtio-serial-bus: use virtio wrappers to access headers, Greg Kurz, 2014/06/13
[Qemu-devel] [PATCH v8 19/20] virtio-9p: use virtio wrappers to access headers, Greg Kurz, 2014/06/13
[Qemu-devel] [PATCH v8 20/20] target-ppc: enable virtio endian ambivalent support, Greg Kurz, 2014/06/13
Re: [Qemu-devel] [PATCH v8 00/20] virtio endian-ambivalent target, Alexander Graf, 2014/06/13