From 9327a1c9966ec9752aaafa420c7bf2b345cdc9fe Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Mon, 22 Dec 2014 11:35:31 +0000
Subject: formatting: drop \ldots in lstlisting

\ldots does not work within lstlisting, the result is
\ldots verbatim in the PDF output.

To fix, replace with a literal ...

VIRTIO-115

Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@447 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index 5bfb082..91bf9f8 100644
--- a/content.tex
+++ b/content.tex
@@ -4786,7 +4786,7 @@ Requests have the following format:
 \begin{lstlisting}
 struct virtio_scsi_ctrl {
         le32 type;
-\ldots
+        ...
         u8 response;
 };
 
-- 
cgit v1.2.3


From 981987a90072a444c53e5936ac31244310fb0326 Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Mon, 22 Dec 2014 11:35:49 +0000
Subject: virtio: fix used element size

General ring description lists size for
used ring elements as 4, it must be 8.

VIRTIO-120

Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@448 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index 91bf9f8..c105e8a 100644
--- a/content.tex
+++ b/content.tex
@@ -255,7 +255,7 @@ Descriptor Table  & 16        & $16 * $(Queue Size) \\
 \hline
 Available Ring    & 2         & $6 + 2 * $(Queue Size) \\
  \hline
-Used Ring         & 4         & $6 + 4 * $(Queue Size) \\
+Used Ring         & 4         & $6 + 8 * $(Queue Size) \\
  \hline
 \end{tabular}
 
-- 
cgit v1.2.3


From e0e91432f9adc245a71a515683a931cee74f55e6 Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Mon, 22 Dec 2014 11:36:09 +0000
Subject: block: fixup section levels

The specification for the configuration layout for block devices
should be its own subsection as for all other devices and not be
hidden beneath "Feature bits".

The normative sections for device operation should appear under
the device operation section.

VIRTIO-125

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@449 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index c105e8a..d2d9ae7 100644
--- a/content.tex
+++ b/content.tex
@@ -217,7 +217,7 @@ The correct endian-ness is documented for each device.
 Legacy devices did not have a configuration generation field, thus are
 susceptible to race conditions if configuration is updated.  This
 affects the block \field{capacity} (see \ref{sec:Device Types /
-Block Device / Feature bits / Device configuration layout}) and
+Block Device / Device configuration layout}) and
 network \field{mac} (see \ref{sec:Device Types / Network Device /
 Device configuration layout}) fields;
 when using the legacy interface, drivers SHOULD
@@ -3739,7 +3739,7 @@ VIRTIO_BLK_F_FLUSH was also called VIRTIO_BLK_F_WCE: Legacy drivers
 MUST only negotiate this feature if they are capable of sending
 VIRTIO_BLK_T_FLUSH commands.
 
-\subsubsection{Device configuration layout}\label{sec:Device Types / Block Device / Feature bits / Device configuration layout}
+\subsection{Device configuration layout}\label{sec:Device Types / Block Device / Device configuration layout}
 
 The \field{capacity} of the device (expressed in 512-byte sectors) is always
 present. The availability of the others all depend on various feature
@@ -3771,7 +3771,7 @@ struct virtio_blk_config {
 \end{lstlisting}
 
 
-\paragraph{Legacy Interface: Device configuration layout}\label{sec:Device Types / Block Device / Feature bits / Device configuration layout / Legacy Interface: Device configuration layout}
+\subsubsection{Legacy Interface: Device configuration layout}\label{sec:Device Types / Block Device / Device configuration layout / Legacy Interface: Device configuration layout}
 When using the legacy interface, transitional devices and drivers
 MUST format the fields in struct virtio_blk_config
 according to the native endian of the guest rather than
@@ -3850,7 +3850,7 @@ error or VIRTIO_BLK_S_UNSUPP for a request unsupported by device:
 #define VIRTIO_BLK_S_UNSUPP    2
 \end{lstlisting}
 
-\drivernormative{\subsection}{Device Operation}{Device Types / Block Device / Device Operation}
+\drivernormative{\subsubsection}{Device Operation}{Device Types / Block Device / Device Operation}
 
 A driver MUST NOT submit a request which would cause a read or write
 beyond \field{capacity}.
@@ -3860,7 +3860,7 @@ A driver SHOULD accept the VIRTIO_BLK_F_RO feature if offered.
 A driver MUST set \field{sector} to 0 for a VIRTIO_BLK_T_FLUSH request.
 A driver SHOULD NOT include any data in a VIRTIO_BLK_T_FLUSH request.
 
-\devicenormative{\subsection}{Device Operation}{Device Types / Block Device / Device Operation}
+\devicenormative{\subsubsection}{Device Operation}{Device Types / Block Device / Device Operation}
 
 A device MUST set the \field{status} byte to VIRTIO_BLK_S_IOERR
 for a write request if the VIRTIO_BLK_F_RO feature if offered, and MUST NOT
-- 
cgit v1.2.3


From 1e1210c5b0d8afaea3369fd6bb1751162015ab2f Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Mon, 22 Dec 2014 11:36:27 +0000
Subject: ccw: two-stage indicators for legacy devices

Some legacy devices will support two-stage queue indicators and therefore
won't reject CCW_CMD_SET_IND_ADAPTER. Note this.

VIRTIO-127

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@450 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index d2d9ae7..952b605 100644
--- a/content.tex
+++ b/content.tex
@@ -2742,8 +2742,11 @@ command reject to any subsequent CCW_CMD_SET_IND_ADAPTER command.
 
 \paragraph{Legacy Interfaces: A Note on Setting Up Indicators}\label{sec:Virtio Transport Options / Virtio over channel I/O / Device Initialization / Setting Up Indicators / Legacy Interfaces: A Note on Setting Up Indicators}
 
-Legacy devices will only support classic queue indicators; they will
-reject CCW_CMD_SET_IND_ADAPTER as they don't know that command.
+In some cases, legacy devices will only support classic queue indicators;
+in that case, they will reject CCW_CMD_SET_IND_ADAPTER as they don't know that
+command. Some legacy devices will support two-stage queue indicators, though,
+and a driver will be able to successfully use CCW_CMD_SET_IND_ADAPTER to set
+them up.
 
 \subsection{Device Operation}\label{sec:Virtio Transport Options / Virtio over channel I/O / Device Operation}
 
-- 
cgit v1.2.3


From ebc8f976306c6e53dca1671b8f902bbe8164c21b Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Tue, 23 Dec 2014 14:04:36 +0000
Subject: Revert "formatting: drop \ldots in lstlisting"

This reverts commit 9327a1c9966ec9752aaafa420c7bf2b345cdc9fe.

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@451 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index 952b605..66a1ed4 100644
--- a/content.tex
+++ b/content.tex
@@ -4789,7 +4789,7 @@ Requests have the following format:
 \begin{lstlisting}
 struct virtio_scsi_ctrl {
         le32 type;
-        ...
+\ldots
         u8 response;
 };
 
-- 
cgit v1.2.3


From d858fdbad24c7e8c90552ecc1f4e963c378dadf2 Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Tue, 23 Dec 2014 14:04:58 +0000
Subject: formatting: escape \ldots in lstlisting

\ldots does not work within lstlisting, the result is
\ldots verbatim in the PDF output.

To fix, make $ an escape character, and escape the sequence:
$\ldots$

VIRTIO-115

Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@452 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index 66a1ed4..56c9807 100644
--- a/content.tex
+++ b/content.tex
@@ -4786,10 +4786,12 @@ according to the native endian of the guest rather than
 The controlq is used for other SCSI transport operations.
 Requests have the following format:
 
+{
+\lstset{escapechar=\$}
 \begin{lstlisting}
 struct virtio_scsi_ctrl {
         le32 type;
-\ldots
+$\ldots$
         u8 response;
 };
 
@@ -4803,6 +4805,7 @@ struct virtio_scsi_ctrl {
 #define VIRTIO_SCSI_S_FAILURE                  9
 #define VIRTIO_SCSI_S_INCORRECT_LUN            12
 \end{lstlisting}
+}
 
 The \field{type} identifies the remaining fields.
 
-- 
cgit v1.2.3


From f1b4fcc103575c6fea9eeb62ba86a59d3ba4ca6f Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Tue, 23 Dec 2014 19:24:34 +0000
Subject: add legacy tag for makediff between cs02 and cs01

This is here merely as a work-around for latex-diff producing
broken cross-references when labels are re-named.
Not needed on trunk.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@454 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index 56c9807..f9300e6 100644
--- a/content.tex
+++ b/content.tex
@@ -3034,6 +3034,7 @@ upon further investigation it became clear that multiple bits
 were needed.
 
 \subsection{Device configuration layout}\label{sec:Device Types / Network Device / Device configuration layout}
+\label{sec:Device Types / Block Device / Feature bits / Device configuration layout}
 
 Three driver-read-only configuration fields are currently defined. The \field{mac} address field
 always exists (though is only valid if VIRTIO_NET_F_MAC is set), and
@@ -3078,6 +3079,7 @@ assume the link is active, otherwise it SHOULD read the link status from
 the bottom bit of \field{status}.
 
 \subsubsection{Legacy Interface: Device configuration layout}\label{sec:Device Types / Network Device / Device configuration layout / Legacy Interface: Device configuration layout}
+\label{sec:Device Types / Block Device / Feature bits / Device configuration layout / Legacy Interface: Device configuration layout}
 When using the legacy interface, transitional devices and drivers
 MUST format \field{status} and
 \field{max_virtqueue_pairs} in struct virtio_net_config
-- 
cgit v1.2.3


From d0ea186fe547a0e7ae4baeb623cf764a3f1ace65 Mon Sep 17 00:00:00 2001
From: mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652>
Date: Tue, 23 Dec 2014 19:26:10 +0000
Subject: formatting: mark change manually as changed in cs02

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@459 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
---
 content.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content.tex')

diff --git a/content.tex b/content.tex
index f9300e6..1efdcc8 100644
--- a/content.tex
+++ b/content.tex
@@ -4793,7 +4793,7 @@ Requests have the following format:
 \begin{lstlisting}
 struct virtio_scsi_ctrl {
         le32 type;
-$\ldots$
+$\DIFdeltextcstwo{{\textbackslash}ldots}\DIFaddtextcstwo{\ldots}$
         u8 response;
 };
 
-- 
cgit v1.2.3

