[PATCH] virtio-ring.h -> virtio-queue.h

Since vring* and VRING* have been replaced with virtq* and VIRTQ*
respectively, rename the header virtio_ring.h to virtio_queue.h.

Suggested-by: Kevin Lo <>
Signed-off-by: Michael S. Tsirkin <>
---

 virtio-ring.h => virtio-queue.h | 0
 cl-cs03.tex                     | 2 +-
 content.tex                     | 4 ++--
 headerfile.tex                  | 4 ++--
 makezip.sh                      | 4 ++--
 specvars.tex                    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename virtio-ring.h => virtio-queue.h (100%)

diff --git a/virtio-ring.h b/virtio-queue.h
similarity index 100%
rename from virtio-ring.h
rename to virtio-queue.h
diff --git a/cl-cs03.tex b/cl-cs03.tex
index ab26d64..72925ca 100644
--- a/cl-cs03.tex
+++ b/cl-cs03.tex
@@ -43,7 +43,7 @@ virtio-ring: comment fixup
 virtio_ring.h included with spec has this text:
 /* Support for avail_idx and used_idx fields */
 it should really refer to avail_event and used_event.
-See Appendix \ref{sec:virtio-ring.h}.
+See Appendix \ref{sec:virtio-queue.h}.
  } \\
 \hline
 486 & 15 Mar 2015 & Jason Wang & {VIRTIO-136:
diff --git a/content.tex b/content.tex
index 5b8a22c..838fc1c 100644
--- a/content.tex
+++ b/content.tex
@@ -442,7 +442,7 @@ this implies that loops in the descriptor chain are forbidden!
 \subsubsection{Indirect Descriptors}\label{sec:Basic Facilities of a Virtio Device / Virtqueues / The Virtqueue Descriptor Table / Indirect Descriptors}
 
 Some devices benefit by concurrently dispatching a large number
-of large requests. The VIRTIO_F_INDIRECT_DESC feature allows this (see \ref{sec:virtio-ring.h}~\nameref{sec:virtio-ring.h}). To increase
+of large requests. The VIRTIO_F_INDIRECT_DESC feature allows this (see \ref{sec:virtio-queue.h}~\nameref{sec:virtio-queue.h}). To increase
 ring capacity the driver can store a table of indirect
 descriptors anywhere in memory, and insert a descriptor in main
 virtqueue (with \field{flags}\&VIRTQ_DESC_F_INDIRECT on) that refers to memory buffer
@@ -717,7 +717,7 @@ helper routines in a more usable form, in
 include/uapi/linux/virtio_ring.h. This was explicitly licensed by IBM
 and Red Hat under the (3-clause) BSD license so that it can be
 freely used by all other projects, and is reproduced (with slight
-variation to remove Linux assumptions) in \ref{sec:virtio-ring.h}~\nameref{sec:virtio-ring.h}.
+variation to remove Linux assumptions) in \ref{sec:virtio-queue.h}~\nameref{sec:virtio-queue.h}.
 
 \chapter{General Initialization And Device Operation}\label{sec:General Initialization And Device Operation}
 
diff --git a/headerfile.tex b/headerfile.tex
index b1a92c2..cdc8114 100644
--- a/headerfile.tex
+++ b/headerfile.tex
@@ -1,8 +1,8 @@
-\chapter{virtio_ring.h}\label{sec:virtio-ring.h}
+\chapter{virtio_queue.h}\label{sec:virtio-queue.h}
 
 This file is also available at the link
 \virtiourlh.
 All definitions in this section are for non-normative reference
 only.
 
-\lstinputlisting{virtio-ring.h}
+\lstinputlisting{virtio-queue.h}
diff --git a/makezip.sh b/makezip.sh
index de52abf..3c94f8e 100755
--- a/makezip.sh
+++ b/makezip.sh
@@ -17,8 +17,8 @@ fi
 zip -d $SPECDOC.zip tex/.gitattributes
 rm -fr listings
 mkdir -p listings
-cp virtio-ring.h listings/virtio_ring.h
-zip $SPECDOC.zip listings/virtio_ring.h
+cp virtio-queue.h listings/virtio_queue.h
+zip $SPECDOC.zip listings/virtio_queue.h
 rm -fr tmpfilesforzip
 mkdir -p tmpfilesforzip/tex
 echo "$SPECDOC" > tmpfilesforzip/tex/REVISION
diff --git a/specvars.tex b/specvars.tex
index 1f7cd9f..84f8bae 100644
--- a/specvars.tex
+++ b/specvars.tex
@@ -7,7 +7,7 @@
 \urldef \virtiourltex\url{\virtiourlbase/tex/}
 \urldef \virtiourlpdf\url{\virtiourlbase/\virtiospecfile.pdf}
 \urldef \virtiourlhtml\url{\virtiourlbase/\virtiospecfile.html}
-\urldef \virtiourlh\url{\virtiourlbase/listings/virtio_ring.h}
+\urldef \virtiourlh\url{\virtiourlbase/listings/virtio_queue.h}
 \urldef \virtiourllatestpdf\url{http://docs.oasis-open.org/virtio/virtio/v\virtiorev/virtio-v\virtiorev.pdf}
 \urldef \virtiourllatesthtml\url{http://docs.oasis-open.org/virtio/virtio/v\virtiorev/virtio-v\virtiorev.html}
 \newcommand{\virtioworkproduct}{Standards Track Work Product}
-- 
MST