Skip to contentSkip to conversation

virtio: drop internal struct from UAPI

PATCH In review Michael S. Tsirkin 3 participants 5 messages Feb 1, 2019 – Feb 2, 2019 virtio core

lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

PATCH 1/1 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

---
 drivers/virtio/virtio_ring.c     |  7 ++++++-
 include/uapi/linux/virtio_ring.h | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)
drivers/virtio/virtio_ring.c +6 -1
index 412e0c431d87..1c85b3423182 100644
@@ -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;
include/uapi/linux/virtio_ring.h +0 -10
index 2414f8af26b3..4c4e24c291a5 100644
@@ -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 */
Signature · 1 line
MST
Acked-by on v1 1/1
#1 lore raw
Quoted 39 lines · Michael S. Tsirkin

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

---
  drivers/virtio/virtio_ring.c     |  7 ++++++-
  include/uapi/linux/virtio_ring.h | 10 ----------
  2 files changed, 6 insertions(+), 11 deletions(-)
drivers/virtio/virtio_ring.c +6 -1
index 412e0c431d87..1c85b3423182 100644
@@ -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;
include/uapi/linux/virtio_ring.h +0 -1
index 2414f8af26b3..4c4e24c291a5 100644
@@ -213,14 +213,4 @@ struct vring_packed_desc {
  	__le16 flags;
  };
 
-struct vring_packed {

include/uapi/linux/virtio_ring.h struct vring_packed_desc { · line 216

Quoted 10 lines
include/uapi/linux/virtio_ring.h +0 -9
-	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 */

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Acked-by on v1 1/1
#2 lore raw
In reply to Michael S. Tsirkin
Quoted 39 lines · Michael S. Tsirkin

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

---
  drivers/virtio/virtio_ring.c     |  7 ++++++-
  include/uapi/linux/virtio_ring.h | 10 ----------
  2 files changed, 6 insertions(+), 11 deletions(-)
drivers/virtio/virtio_ring.c +6 -1
index 412e0c431d87..1c85b3423182 100644
@@ -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;
include/uapi/linux/virtio_ring.h +0 -1
index 2414f8af26b3..4c4e24c291a5 100644
@@ -213,14 +213,4 @@ struct vring_packed_desc {
  	__le16 flags;
  };
 
-struct vring_packed {

include/uapi/linux/virtio_ring.h struct vring_packed_desc { · line 216

Quoted 10 lines
include/uapi/linux/virtio_ring.h +0 -9
-	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 */
Acked-by on v1 1/1
#3 lore raw
In reply to Michael S. Tsirkin
Quoted 51 lines · Michael S. Tsirkin

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

---
 drivers/virtio/virtio_ring.c     |  7 ++++++-
 include/uapi/linux/virtio_ring.h | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)
drivers/virtio/virtio_ring.c +6 -1
index 412e0c431d87..1c85b3423182 100644
@@ -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;
include/uapi/linux/virtio_ring.h +0 -10
index 2414f8af26b3..4c4e24c291a5 100644
@@ -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 */
Signature · 1 line
MST
Acked-by on v1 1/1
#4 lore raw
In reply to Michael S. Tsirkin
Quoted 51 lines · Michael S. Tsirkin

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

---
 drivers/virtio/virtio_ring.c     |  7 ++++++-
 include/uapi/linux/virtio_ring.h | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)
drivers/virtio/virtio_ring.c +6 -1
index 412e0c431d87..1c85b3423182 100644
@@ -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;
include/uapi/linux/virtio_ring.h +0 -10
index 2414f8af26b3..4c4e24c291a5 100644
@@ -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 */
Signature · 1 line
MST