Merge remote-tracking branch 'origin/v1.0'

Conflicts:
	content.tex
	makediff.sh

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/trunk@477 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652

1 files changed, 6 insertions, 1 deletions

diff --git a/content.tex b/content.tex
index 952b605..1efdcc8 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
@@ -4786,10 +4788,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;
-        ...
+$\DIFdeltextcstwo{{\textbackslash}ldots}\DIFaddtextcstwo{\ldots}$
         u8 response;
 };
 
@@ -4803,6 +4807,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.