diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2019-02-01 17:13:57 -0500 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-02-05 15:29:48 -0500 |
| commit | 9c0644ee4aa8792f1e60a2b014b4710faaddafeb (patch) | |
| tree | e0cebd49e0ccec658164d90fd5d4f122c89503e0 | |
| parent | 45383fb0f42db3945ac6cc658704706cdae19528 (diff) | |
| download | linux-9c0644ee4aa8792f1e60a2b014b4710faaddafeb.tar.gz | |
virtio: drop internal struct from UAPI
There's no reason to expose struct vring_packed in UAPI - if we do we won't be able to change or drop it, and it's not part of any interface. Let's move it to virtio_ring.c Cc: Tiwei Bie <tiwei.bie@intel.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | drivers/virtio/virtio_ring.c | 7 | ||||
| -rw-r--r-- | include/uapi/linux/virtio_ring.h | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 27d3f057493e..a0b07c331255 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -152,7 +152,12 @@ struct vring_virtqueue { /* Available for packed ring */ struct { /* Actual memory layout for this queue. */ - struct vring_packed vring; + struct { + unsigned int num; + struct vring_packed_desc *desc; + struct vring_packed_desc_event *driver; + struct vring_packed_desc_event *device; + } vring; /* Driver ring wrap counter. */ bool avail_wrap_counter; diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index 2414f8af26b3..4c4e24c291a5 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -213,14 +213,4 @@ struct vring_packed_desc { __le16 flags; }; -struct vring_packed { - unsigned int num; - - struct vring_packed_desc *desc; - - struct vring_packed_desc_event *driver; - - struct vring_packed_desc_event *device; -}; - #endif /* _UAPI_LINUX_VIRTIO_RING_H */ |