Re: [Qemu-devel] [PATCH 3/7] hw/net/virtio-net: use virtio wrappers to access headers.

[Anthony Liguori <anthony@codemonkey.ws>]

Rusty Russell <rusty@rustcorp.com.au> writes:

> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

> ---
>  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 1ea9556..e77e28d 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -21,6 +21,7 @@
>  #include "hw/virtio/virtio-net.h"
>  #include "net/vhost_net.h"
>  #include "hw/virtio/virtio-bus.h"
> +#include "hw/virtio/virtio-access.h"
>  
>  #define VIRTIO_NET_VM_VERSION    11
>  
> @@ -70,8 +71,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);
>  }
> @@ -510,7 +511,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)) {
>          return VIRTIO_NET_ERR;
>      }
> @@ -537,7 +538,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)) {
>          return VIRTIO_NET_ERR;
>      }
> @@ -569,7 +570,7 @@ static int virtio_net_handle_vlan_table(VirtIONet *n, uint8_t cmd,
>      size_t s;
>  
>      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;
>      }
> @@ -604,7 +605,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 ||
> @@ -903,7 +904,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);
> -- 
> 1.8.1.2