github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 10:04:42 +00:00
Code Issues Projects Releases Wiki Activity

dm: virtio: rename virtio ring structures and feature bits

Browse Source 
Some virtio ring structures and virtio feature bits are using the
same name/definition as those in kernel header files(linux/
virtio_ring.h, linux/virtio_config.h). Kernel header files must
be included to perform ioctls to support vhost. There are
compiling errors due to duplicated definitions. In this patch
the following renamings are done:

VRING_DESC_F_NEXT -> ACRN_VRING_DESC_F_NEXT
VRING_DESC_F_WRITE -> ACRN_VRING_DESC_F_WRITE
VRING_DESC_F_INDIRECT -> ACRN_VRING_DESC_F_INDIRECT

VRING_AVAIL_F_NO_INTERRUPT -> ACRN_VRING_AVAIL_F_NO_INTERRUPT
VRING_USED_F_NO_NOTIFY -> ACRN_VRING_USED_F_NO_NOTIFY

VIRTIO_F_NOTIFY_ON_EMPTY -> ACRN_VIRTIO_F_NOTIFY_ON_EMPTY
VIRTIO_RING_F_INDIRECT_DESC -> ACRN_VIRTIO_RING_F_INDIRECT_DESC
VIRTIO_RING_F_EVENT_IDX -> ACRN_VIRTIO_RING_F_EVENT_IDX
VIRTIO_F_VERSION_1 -> ACRN_VIRTIO_F_VERSION_1

vring_avail -> virtio_vring_avail
vring_used -> virtio_vring_used
vring_size -> virtio_vring_size

Tracked-On: #1329
Signed-off-by: Jian Jun Chen <jian.jun.chen@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Jian Jun Chen
2018-08-10 14:46:39 +08:00
committed by lijinxia
parent dd6a5fbe95
commit 781e7dfb29
7 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devicemodel/hw/pci/virtio/virtio_net.c
View File

@@ -74,7 +74,7 @@
#define VIRTIO_NET_S_HOSTCAPS \
(VIRTIO_NET_F_MAC | VIRTIO_NET_F_MRG_RXBUF | VIRTIO_NET_F_STATUS | \
VIRTIO_F_NOTIFY_ON_EMPTY | VIRTIO_RING_F_INDIRECT_DESC)
ACRN_VIRTIO_F_NOTIFY_ON_EMPTY | ACRN_VIRTIO_RING_F_INDIRECT_DESC)
/* is address mcast/bcast? */
#define ETHER_IS_MULTICAST(addr) (*(addr) & 0x01)
@@ -432,7 +432,7 @@ virtio_net_ping_rxq(void *vdev, struct virtio_vq_info *vq)
*/
if (net->rx_ready == 0) {
net->rx_ready = 1;
vq->used->flags |= VRING_USED_F_NO_NOTIFY;
vq->used->flags |= ACRN_VRING_USED_F_NO_NOTIFY;
}
}
@@ -478,7 +478,7 @@ virtio_net_ping_txq(void *vdev, struct virtio_vq_info *vq)
/* Signal the tx thread for processing */
pthread_mutex_lock(&net->tx_mtx);
vq->used->flags |= VRING_USED_F_NO_NOTIFY;
vq->used->flags |= ACRN_VRING_USED_F_NO_NOTIFY;
if (net->tx_in_progress == 0)
pthread_cond_signal(&net->tx_cond);
pthread_mutex_unlock(&net->tx_mtx);
@@ -512,7 +512,7 @@ virtio_net_tx_thread(void *param)
for (;;) {
/* note - tx mutex is locked here */
while (net->resetting || !vq_has_descs(vq)) {
vq->used->flags &= ~VRING_USED_F_NO_NOTIFY;
vq->used->flags &= ~ACRN_VRING_USED_F_NO_NOTIFY;
/* memory barrier */
mb();
if (!net->resetting && vq_has_descs(vq))
@@ -527,7 +527,7 @@ virtio_net_tx_thread(void *param)
return NULL;
}
}
vq->used->flags |= VRING_USED_F_NO_NOTIFY;
vq->used->flags |= ACRN_VRING_USED_F_NO_NOTIFY;
net->tx_in_progress = 1;
pthread_mutex_unlock(&net->tx_mtx);