[PATCH v3 11/20] virtio-vsock: Maintain socket device spec in separate directory

[Parav Pandit <parav@nvidia.com>]

Place device specification, its driver and device
conformance into its own directory to have self contained device
specification.

Fixes: https://github.com/oasis-tcs/virtio-spec/issues/153
Signed-off-by: Parav Pandit <parav@nvidia.com>
---
changelog:
v2->v3:
- file name changed from device.tex to description.tex
- use input instead of import to insert a file
v0->v1:
- new patch
---
 conformance.tex                               | 48 +------------------
 content.tex                                   |  2 +-
 .../virtio-vsock/description.tex              |  0
 .../virtio-vsock/device-conformance.tex       |  9 ++++
 .../virtio-vsock/driver-conformance.tex       | 10 ++++
 5 files changed, 22 insertions(+), 47 deletions(-)
 rename virtio-vsock.tex => device-types/virtio-vsock/description.tex (100%)
 create mode 100644 device-types/virtio-vsock/device-conformance.tex
 create mode 100644 device-types/virtio-vsock/driver-conformance.tex

diff --git a/conformance.tex b/conformance.tex
index 662a5a1..40cbbfa 100644
--- a/conformance.tex
+++ b/conformance.tex
@@ -142,17 +142,7 @@ \section{Conformance Targets}\label{sec:Conformance / Conformance Targets}
 \input{device-types/virtio-scsi/driver-conformance.tex}
 \input{device-types/virtio-input/driver-conformance.tex}
 \input{device-types/virtio-crypto/driver-conformance.tex}
-
-\conformance{\subsection}{Socket Driver Conformance}\label{sec:Conformance / Driver Conformance / Socket Driver Conformance}
-
-A socket driver MUST conform to the following normative statements:
-
-\begin{itemize}
-\item \ref{drivernormative:Device Types / Socket Device / Feature bits}
-\item \ref{drivernormative:Device Types / Socket Device / Device Operation / Buffer Space Management}
-\item \ref{drivernormative:Device Types / Socket Device / Device Operation / Receive and Transmit}
-\item \ref{drivernormative:Device Types / Socket Device / Device Operation / Device Events}
-\end{itemize}
+\input{device-types/virtio-vsock/driver-conformance.tex}
 
 \conformance{\subsection}{File System Driver Conformance}\label{sec:Conformance / Driver Conformance / File System Driver Conformance}
 
@@ -328,41 +318,7 @@ \section{Conformance Targets}\label{sec:Conformance / Conformance Targets}
 \input{device-types/virtio-gpu/device-conformance.tex}
 \input{device-types/virtio-input/device-conformance.tex}
 \input{device-types/virtio-crypto/device-conformance.tex}
-
-\conformance{\subsection}{Crypto Device Conformance}\label{sec:Conformance / Device Conformance / Crypto Device Conformance}
-
-A Crypto device MUST conform to the following normative statements:
-
-\begin{itemize}
-\item \ref{devicenormative:Device Types / Crypto Device / Device configuration layout}
-\item \ref{devicenormative:Device Types / Crypto Device / Device Operation / Control Virtqueue / Session operation / Session operation: create session}
-\item \ref{devicenormative:Device Types / Crypto Device / Device Operation / Control Virtqueue / Session operation / Session operation: destroy session}
-\item \ref{devicenormative:Device Types / Crypto Device / Device Operation / HASH Service Operation}
-\item \ref{devicenormative:Device Types / Crypto Device / Device Operation / MAC Service Operation}
-\item \ref{devicenormative:Device Types / Crypto Device / Device Operation / Symmetric algorithms Operation}
-\item \ref{devicenormative:Device Types / Crypto Device / Device Operation / AEAD Service Operation}
-\end{itemize}
-=======
-\import{device-types/virtio-network/}{device-conformance}
-\import{device-types/virtio-block/}{device-conformance}
-\import{device-types/virtio-console/}{device-conformance}
-\import{device-types/virtio-entropy/}{device-conformance}
-\import{device-types/virtio-mem-balloon/}{device-conformance}
-\import{device-types/virtio-scsi/}{device-conformance}
-\import{device-types/virtio-gpu/}{device-conformance}
-\import{device-types/virtio-input/}{device-conformance}
-\import{device-types/virtio-crypto/}{device-conformance}
->>>>>>> a695ea2... virtio-crypto: Maintain crypto device spec in separate directory
-
-\conformance{\subsection}{Socket Device Conformance}\label{sec:Conformance / Device Conformance / Socket Device Conformance}
-
-A socket device MUST conform to the following normative statements:
-
-\begin{itemize}
-\item \ref{devicenormative:Device Types / Socket Device / Feature bits}
-\item \ref{devicenormative:Device Types / Socket Device / Device Operation / Buffer Space Management}
-\item \ref{devicenormative:Device Types / Socket Device / Device Operation / Receive and Transmit}
-\end{itemize}
+\input{device-types/virtio-vsock/device-conformance.tex}
 
 \conformance{\subsection}{File System Device Conformance}\label{sec:Conformance / Device Conformance / File System Device Conformance}
 
diff --git a/content.tex b/content.tex
index f7cbecb..5a4e70a 100644
--- a/content.tex
+++ b/content.tex
@@ -3012,7 +3012,7 @@ \chapter{Device Types}\label{sec:Device Types}
 \input{device-types/virtio-gpu/description.tex}
 \input{device-types/virtio-input/description.tex}
 \input{device-types/virtio-crypto/description.tex}
-\input{virtio-vsock.tex}
+\input{device-types/virtio-vsock/description.tex}
 \input{virtio-fs.tex}
 \input{virtio-rpmb.tex}
 \input{virtio-iommu.tex}
diff --git a/virtio-vsock.tex b/device-types/virtio-vsock/description.tex
similarity index 100%
rename from virtio-vsock.tex
rename to device-types/virtio-vsock/description.tex
diff --git a/device-types/virtio-vsock/device-conformance.tex b/device-types/virtio-vsock/device-conformance.tex
new file mode 100644
index 0000000..93b0c4d
--- /dev/null
+++ b/device-types/virtio-vsock/device-conformance.tex
@@ -0,0 +1,9 @@
+\conformance{\subsection}{Socket Device Conformance}\label{sec:Conformance / Device Conformance / Socket Device Conformance}
+
+A socket device MUST conform to the following normative statements:
+
+\begin{itemize}
+\item \ref{devicenormative:Device Types / Socket Device / Feature bits}
+\item \ref{devicenormative:Device Types / Socket Device / Device Operation / Buffer Space Management}
+\item \ref{devicenormative:Device Types / Socket Device / Device Operation / Receive and Transmit}
+\end{itemize}
diff --git a/device-types/virtio-vsock/driver-conformance.tex b/device-types/virtio-vsock/driver-conformance.tex
new file mode 100644
index 0000000..988b0c3
--- /dev/null
+++ b/device-types/virtio-vsock/driver-conformance.tex
@@ -0,0 +1,10 @@
+\conformance{\subsection}{Socket Driver Conformance}\label{sec:Conformance / Driver Conformance / Socket Driver Conformance}
+
+A socket driver MUST conform to the following normative statements:
+
+\begin{itemize}
+\item \ref{drivernormative:Device Types / Socket Device / Feature bits}
+\item \ref{drivernormative:Device Types / Socket Device / Device Operation / Buffer Space Management}
+\item \ref{drivernormative:Device Types / Socket Device / Device Operation / Receive and Transmit}
+\item \ref{drivernormative:Device Types / Socket Device / Device Operation / Device Events}
+\end{itemize}
-- 
2.26.2