[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] hw/net/virtio-net: use virtio wrappers to acces
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH 3/8] hw/net/virtio-net: use virtio wrappers to access headers. |
Date: |
Tue, 18 Feb 2014 13:39:00 +0100 |
User-agent: |
StGit/0.16 |
From: Rusty Russell <address@hidden>
Signed-off-by: Rusty Russell <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
---
hw/net/virtio-net.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 3626608..34d6b48 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -23,6 +23,7 @@
#include "hw/virtio/virtio-bus.h"
#include "qapi/qmp/qjson.h"
#include "monitor/monitor.h"
+#include "hw/virtio/virtio-access.h"
#define VIRTIO_NET_VM_VERSION 11
@@ -72,8 +73,8 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t
*config)
VirtIONet *n = VIRTIO_NET(vdev);
struct virtio_net_config netcfg;
- stw_p(&netcfg.status, n->status);
- stw_p(&netcfg.max_virtqueue_pairs, n->max_queues);
+ virtio_stw_p(&netcfg.status, n->status);
+ virtio_stw_p(&netcfg.max_virtqueue_pairs, n->max_queues);
memcpy(netcfg.mac, n->mac, ETH_ALEN);
memcpy(config, &netcfg, n->config_size);
}
@@ -618,7 +619,7 @@ static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd,
s = iov_to_buf(iov, iov_cnt, 0, &mac_data.entries,
sizeof(mac_data.entries));
- mac_data.entries = ldl_p(&mac_data.entries);
+ mac_data.entries = virtio_ldl_p(&mac_data.entries);
if (s != sizeof(mac_data.entries)) {
goto error;
}
@@ -645,7 +646,7 @@ static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd,
s = iov_to_buf(iov, iov_cnt, 0, &mac_data.entries,
sizeof(mac_data.entries));
- mac_data.entries = ldl_p(&mac_data.entries);
+ mac_data.entries = virtio_ldl_p(&mac_data.entries);
if (s != sizeof(mac_data.entries)) {
goto error;
}
@@ -690,7 +691,7 @@ static int virtio_net_handle_vlan_table(VirtIONet *n,
uint8_t cmd,
NetClientState *nc = qemu_get_queue(n->nic);
s = iov_to_buf(iov, iov_cnt, 0, &vid, sizeof(vid));
- vid = lduw_p(&vid);
+ vid = virtio_lduw_p(&vid);
if (s != sizeof(vid)) {
return VIRTIO_NET_ERR;
}
@@ -727,7 +728,7 @@ static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
return VIRTIO_NET_ERR;
}
- queues = lduw_p(&mq.virtqueue_pairs);
+ queues = virtio_lduw_p(&mq.virtqueue_pairs);
if (queues < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN ||
queues > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX ||
@@ -1026,7 +1027,7 @@ static ssize_t virtio_net_receive(NetClientState *nc,
const uint8_t *buf, size_t
}
if (mhdr_cnt) {
- stw_p(&mhdr.num_buffers, i);
+ virtio_stw_p(&mhdr.num_buffers, i);
iov_from_buf(mhdr_sg, mhdr_cnt,
0,
&mhdr.num_buffers, sizeof mhdr.num_buffers);
- Re: [Qemu-devel] [PATCH 1/8] virtio_get_byteswap: function for endian-ambivalent targets using virtio., (continued)
- Re: [Qemu-devel] [PATCH 1/8] virtio_get_byteswap: function for endian-ambivalent targets using virtio., Cornelia Huck, 2014/02/18
- Re: [Qemu-devel] [PATCH 1/8] virtio_get_byteswap: function for endian-ambivalent targets using virtio., Cornelia Huck, 2014/02/18
- Re: [Qemu-devel] [PATCH 1/8] virtio_get_byteswap: function for endian-ambivalent targets using virtio., Alexander Graf, 2014/02/18
- Re: [Qemu-devel] [PATCH 1/8] virtio_get_byteswap: function for endian-ambivalent targets using virtio., Cornelia Huck, 2014/02/18
- Re: [Qemu-devel] [PATCH 1/8] virtio_get_byteswap: function for endian-ambivalent targets using virtio., Alexander Graf, 2014/02/18
- [Qemu-devel] [PATCH 2/8] virtio: allow byte swapping for vring and config access, Greg Kurz, 2014/02/18
- Re: [Qemu-devel] [PATCH 2/8] virtio: allow byte swapping for vring and config access, Cornelia Huck, 2014/02/18
- Re: [Qemu-devel] [PATCH 2/8] virtio: allow byte swapping for vring and config access, Greg Kurz, 2014/02/18
- [Qemu-devel] [PATCH 3/8] hw/net/virtio-net: use virtio wrappers to access headers.,
Greg Kurz <=
- [Qemu-devel] [PATCH 4/8] hw/net/virtio-balloon: use virtio wrappers to access page frame numbers., Greg Kurz, 2014/02/18
- [Qemu-devel] [PATCH 6/8] hw/scsi/virtio-scsi: use virtio wrappers to access headers., Greg Kurz, 2014/02/18
- [Qemu-devel] [PATCH 5/8] hw/block/virtio-blk: use virtio wrappers to access headers., Greg Kurz, 2014/02/18
- [Qemu-devel] [PATCH 7/8] hw/char/virtio-serial-bus: use virtio wrappers to access headers., Greg Kurz, 2014/02/18
- [Qemu-devel] [PATCH 8/8] hw/9pfs/virtio_9p_device: use virtio wrappers to access headers., Greg Kurz, 2014/02/18
- Re: [Qemu-devel] [PATCH 0/8] virtio endian-ambivalent target fixes (rebased), Andreas Färber, 2014/02/18
Re: [Qemu-devel] [PATCH 0/7] virtio endian-ambivalent target fixes., Thomas Huth, 2014/02/14