From c227f0995e1722a1abccc28cadf0664266bd8043 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 1 Oct 2009 16:12:16 -0500 Subject: Revert "Get rid of _t suffix" In the very least, a change like this requires discussion on the list. The naming convention is goofy and it causes a massive merge problem. Something like this _must_ be presented on the list first so people can provide input and cope with it. This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29. Signed-off-by: Anthony Liguori --- hw/virtio-balloon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'hw/virtio-balloon.c') diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index d535ef5..cfd3b41 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -84,10 +84,10 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq) while (memcpy_from_iovector(&pfn, offset, 4, elem.out_sg, elem.out_num) == 4) { - a_ram_addr pa; - a_ram_addr addr; + ram_addr_t pa; + ram_addr_t addr; - pa = (a_ram_addr)ldl_p(&pfn) << VIRTIO_BALLOON_PFN_SHIFT; + pa = (ram_addr_t)ldl_p(&pfn) << VIRTIO_BALLOON_PFN_SHIFT; offset += 4; addr = cpu_get_physical_page_desc(pa); @@ -129,7 +129,7 @@ static uint32_t virtio_balloon_get_features(VirtIODevice *vdev) return 0; } -static a_ram_addr virtio_balloon_to_target(void *opaque, a_ram_addr target) +static ram_addr_t virtio_balloon_to_target(void *opaque, ram_addr_t target) { VirtIOBalloon *dev = opaque; -- cgit v1.1