Currently specification uses virtqueue index and number interchangeably to refer to the virtqueue.
Instead refer to it by its number. Fixes: https://github.com/oasis-tcs/virtio-spec/issues/163 Signed-off-by: Parav Pandit <pa...@nvidia.com> --- changelog: v3->v4: - moved note to comment v2->v3: - added comment note for queue_select similar to max_queue_size v0->v1: - new patch --- transport-ccw.tex | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/transport-ccw.tex b/transport-ccw.tex index b4bc83b..b405db1 100644 --- a/transport-ccw.tex +++ b/transport-ccw.tex @@ -236,12 +236,12 @@ \subsubsection{Configuring a Virtqueue}\label{sec:Virtio Transport Options / Vir \begin{lstlisting} struct vq_config_block { - be16 index; + be16 queue_select; /* Previously named as index */ be16 max_queue_size; /* Previously named as max_num */ }; \end{lstlisting} -The requested number of buffers for queue \field{index} is returned in +The requested number of buffers for queue \field{queue_select} is returned in \field{max_queue_size}. Afterwards, CCW_CMD_SET_VQ is issued by the driver to inform the @@ -252,7 +252,7 @@ \subsubsection{Configuring a Virtqueue}\label{sec:Virtio Transport Options / Vir struct vq_info_block { be64 desc; be32 res0; - be16 index; + be16 queue_select; /* Previously named as index */ be16 size; /* Previously named as num */ be64 driver; be64 device; @@ -261,7 +261,7 @@ \subsubsection{Configuring a Virtqueue}\label{sec:Virtio Transport Options / Vir \field{desc}, \field{driver} and \field{device} contain the guest addresses for the descriptor area, -available area and used area for queue \field{index}, respectively. The actual +available area and used area for queue number \field{queue_select}, respectively. The actual virtqueue size (number of allocated buffers) is transmitted in \field{size}. @@ -278,12 +278,13 @@ \subsubsection{Configuring a Virtqueue}\label{sec:Virtio Transport Options / Vir struct vq_info_block_legacy { be64 queue; be32 align; - be16 index; + be16 queue_select; /* Previously named as index */ be16 size; /* Previously named as num */ }; \end{lstlisting} -\field{queue} contains the guest address for queue \field{index}, +\field{queue} contains the guest address for queue number +\field{queue_select}, \field{size} the number of buffers and \field{align} the alignment. The queue layout follows \ref{sec:Basic Facilities of a Virtio Device / Virtqueues / Legacy Interfaces: A Note on Virtqueue Layout}~\nameref{sec:Basic Facilities of a Virtio Device / Virtqueues / Legacy Interfaces: A Note on Virtqueue Layout}. @@ -571,7 +572,7 @@ \subsubsection{Guest->Host Notification}\label{sec:Virtio Transport Options / Vi For example: \begin{lstlisting} info->cookie = do_notify(schid, - virtqueue_get_queue_index(vq), + virtqueue_get_queue_number(vq), info->cookie); \end{lstlisting} \end{note} -- 2.26.2 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscr...@lists.oasis-open.org For additional commands, e-mail: virtio-dev-h...@lists.oasis-open.org