| Message ID | 20180622134327.18973-2-maxime.coquelin@redhat.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | Maxime Coquelin |
| Headers | show |
| Series |
|
| Related | show |
| Context | Check | Description |
|---|---|---|
| ci/Intel-compilation | fail | Compilation issues |
On Fri, Jun 22, 2018 at 03:43:13PM +0200, Maxime Coquelin wrote: > From: Jens Freimann <jfreimann@redhat.com> > > Signed-off-by: Jens Freimann <jfreimann@redhat.com> > --- > lib/librte_vhost/vhost.h | 4 ++++ > lib/librte_vhost/virtio-packed.h | 22 ++++++++++++++++++++++ > 2 files changed, 26 insertions(+) > create mode 100644 lib/librte_vhost/virtio-packed.h > > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h > index 3f8fa3a78..bf2059198 100644 > --- a/lib/librte_vhost/vhost.h > +++ b/lib/librte_vhost/vhost.h > @@ -191,6 +191,10 @@ struct vhost_msg { > #ifndef VIRTIO_F_VERSION_1 > #define VIRTIO_F_VERSION_1 32 > #endif > +#ifndef VIRTIO_F_RING_PACKED > + #define VIRTIO_F_RING_PACKED 34 > +#endif > +#define VHOST_USER_F_PROTOCOL_FEATURES 30 VHOST_USER_F_PROTOCOL_FEATURES has already been defined in rte_vhost.h which has been included in this file. > > /* Features supported by this builtin vhost-user net driver. */ > #define VIRTIO_NET_SUPPORTED_FEATURES ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \ > diff --git a/lib/librte_vhost/virtio-packed.h b/lib/librte_vhost/virtio-packed.h > new file mode 100644 > index 000000000..744b3991b > --- /dev/null > +++ b/lib/librte_vhost/virtio-packed.h > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) Red Hat Inc. > + */ > + > +#ifndef __VIRTIO_PACKED_H > +#define __VIRTIO_PACKED_H > + > +#define VRING_DESC_F_NEXT 1 > +#define VRING_DESC_F_WRITE 2 > +#define VRING_DESC_F_INDIRECT 4 > + > +#define VRING_DESC_F_AVAIL (1ULL << 7) > +#define VRING_DESC_F_USED (1ULL << 15) > + > +struct vring_desc_packed { > + uint64_t addr; > + uint32_t len; > + uint16_t index; > + uint16_t flags; > +}; > + > +#endif /* __VIRTIO_PACKED_H */ > -- > 2.14.4 >
On 06/29/2018 05:47 PM, Tiwei Bie wrote: > On Fri, Jun 22, 2018 at 03:43:13PM +0200, Maxime Coquelin wrote: >> From: Jens Freimann<jfreimann@redhat.com> >> >> Signed-off-by: Jens Freimann<jfreimann@redhat.com> >> --- >> lib/librte_vhost/vhost.h | 4 ++++ >> lib/librte_vhost/virtio-packed.h | 22 ++++++++++++++++++++++ >> 2 files changed, 26 insertions(+) >> create mode 100644 lib/librte_vhost/virtio-packed.h >> >> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h >> index 3f8fa3a78..bf2059198 100644 >> --- a/lib/librte_vhost/vhost.h >> +++ b/lib/librte_vhost/vhost.h >> @@ -191,6 +191,10 @@ struct vhost_msg { >> #ifndef VIRTIO_F_VERSION_1 >> #define VIRTIO_F_VERSION_1 32 >> #endif >> +#ifndef VIRTIO_F_RING_PACKED >> + #define VIRTIO_F_RING_PACKED 34 >> +#endif >> +#define VHOST_USER_F_PROTOCOL_FEATURES 30 > VHOST_USER_F_PROTOCOL_FEATURES has already been > defined in rte_vhost.h which has been included > in this file. Good catch! Thanks, Maxime
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 3f8fa3a78..bf2059198 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -191,6 +191,10 @@ struct vhost_msg { #ifndef VIRTIO_F_VERSION_1 #define VIRTIO_F_VERSION_1 32 #endif +#ifndef VIRTIO_F_RING_PACKED + #define VIRTIO_F_RING_PACKED 34 +#endif +#define VHOST_USER_F_PROTOCOL_FEATURES 30 /* Features supported by this builtin vhost-user net driver. */ #define VIRTIO_NET_SUPPORTED_FEATURES ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \ diff --git a/lib/librte_vhost/virtio-packed.h b/lib/librte_vhost/virtio-packed.h new file mode 100644 index 000000000..744b3991b --- /dev/null +++ b/lib/librte_vhost/virtio-packed.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) Red Hat Inc. + */ + +#ifndef __VIRTIO_PACKED_H +#define __VIRTIO_PACKED_H + +#define VRING_DESC_F_NEXT 1 +#define VRING_DESC_F_WRITE 2 +#define VRING_DESC_F_INDIRECT 4 + +#define VRING_DESC_F_AVAIL (1ULL << 7) +#define VRING_DESC_F_USED (1ULL << 15) + +struct vring_desc_packed { + uint64_t addr; + uint32_t len; + uint16_t index; + uint16_t flags; +}; + +#endif /* __VIRTIO_PACKED_H */