Revision a8170e5e hw/virtio.h

b/hw/virtio.h
69 69

  
70 70
struct VirtQueue;
71 71

  
72
static inline target_phys_addr_t vring_align(target_phys_addr_t addr,
72
static inline hwaddr vring_align(hwaddr addr,
73 73
                                             unsigned long align)
74 74
{
75 75
    return (addr + align - 1) & ~(align - 1);
......
84 84
    unsigned int index;
85 85
    unsigned int out_num;
86 86
    unsigned int in_num;
87
    target_phys_addr_t in_addr[VIRTQUEUE_MAX_SIZE];
88
    target_phys_addr_t out_addr[VIRTQUEUE_MAX_SIZE];
87
    hwaddr in_addr[VIRTQUEUE_MAX_SIZE];
88
    hwaddr out_addr[VIRTQUEUE_MAX_SIZE];
89 89
    struct iovec in_sg[VIRTQUEUE_MAX_SIZE];
90 90
    struct iovec out_sg[VIRTQUEUE_MAX_SIZE];
91 91
} VirtQueueElement;
......
144 144
void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
145 145
                    unsigned int len, unsigned int idx);
146 146

  
147
void virtqueue_map_sg(struct iovec *sg, target_phys_addr_t *addr,
147
void virtqueue_map_sg(struct iovec *sg, hwaddr *addr,
148 148
    size_t num_sg, int is_write);
149 149
int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem);
150 150
int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes,
......
178 178
void virtio_config_writeb(VirtIODevice *vdev, uint32_t addr, uint32_t data);
179 179
void virtio_config_writew(VirtIODevice *vdev, uint32_t addr, uint32_t data);
180 180
void virtio_config_writel(VirtIODevice *vdev, uint32_t addr, uint32_t data);
181
void virtio_queue_set_addr(VirtIODevice *vdev, int n, target_phys_addr_t addr);
182
target_phys_addr_t virtio_queue_get_addr(VirtIODevice *vdev, int n);
181
void virtio_queue_set_addr(VirtIODevice *vdev, int n, hwaddr addr);
182
hwaddr virtio_queue_get_addr(VirtIODevice *vdev, int n);
183 183
int virtio_queue_get_num(VirtIODevice *vdev, int n);
184 184
void virtio_queue_notify(VirtIODevice *vdev, int n);
185 185
uint16_t virtio_queue_vector(VirtIODevice *vdev, int n);
......
220 220
	DEFINE_PROP_BIT("event_idx", _state, _field, \
221 221
			VIRTIO_RING_F_EVENT_IDX, true)
222 222

  
223
target_phys_addr_t virtio_queue_get_desc_addr(VirtIODevice *vdev, int n);
224
target_phys_addr_t virtio_queue_get_avail_addr(VirtIODevice *vdev, int n);
225
target_phys_addr_t virtio_queue_get_used_addr(VirtIODevice *vdev, int n);
226
target_phys_addr_t virtio_queue_get_ring_addr(VirtIODevice *vdev, int n);
227
target_phys_addr_t virtio_queue_get_desc_size(VirtIODevice *vdev, int n);
228
target_phys_addr_t virtio_queue_get_avail_size(VirtIODevice *vdev, int n);
229
target_phys_addr_t virtio_queue_get_used_size(VirtIODevice *vdev, int n);
230
target_phys_addr_t virtio_queue_get_ring_size(VirtIODevice *vdev, int n);
223
hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n);
224
hwaddr virtio_queue_get_avail_addr(VirtIODevice *vdev, int n);
225
hwaddr virtio_queue_get_used_addr(VirtIODevice *vdev, int n);
226
hwaddr virtio_queue_get_ring_addr(VirtIODevice *vdev, int n);
227
hwaddr virtio_queue_get_desc_size(VirtIODevice *vdev, int n);
228
hwaddr virtio_queue_get_avail_size(VirtIODevice *vdev, int n);
229
hwaddr virtio_queue_get_used_size(VirtIODevice *vdev, int n);
230
hwaddr virtio_queue_get_ring_size(VirtIODevice *vdev, int n);
231 231
uint16_t virtio_queue_get_last_avail_idx(VirtIODevice *vdev, int n);
232 232
void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx);
233 233
VirtQueue *virtio_get_queue(VirtIODevice *vdev, int n);

Also available in: Unified diff