[PATCH v3 10/20] virtio-crypto: Maintain crypto device spec in separate directory

[Parav Pandit <parav@nvidia.com>]

Move virtio crypto device specification to its own file similar to
recent virtio devices.
While at it, 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:
- moved to device specific directory
---
 conformance.tex                               | 28 +++++++++----------
 content.tex                                   |  2 +-
 .../virtio-crypto/description.tex             |  0
 .../virtio-crypto/device-conformance.tex      | 13 +++++++++
 .../virtio-crypto/driver-conformance.tex      | 14 ++++++++++
 5 files changed, 41 insertions(+), 16 deletions(-)
 rename virtio-crypto.tex => device-types/virtio-crypto/description.tex (100%)
 create mode 100644 device-types/virtio-crypto/device-conformance.tex
 create mode 100644 device-types/virtio-crypto/driver-conformance.tex

diff --git a/conformance.tex b/conformance.tex
index 48ee3d1..662a5a1 100644
--- a/conformance.tex
+++ b/conformance.tex
@@ -141,21 +141,7 @@ \section{Conformance Targets}\label{sec:Conformance / Conformance Targets}
 \input{device-types/virtio-mem-balloon/driver-conformance.tex}
 \input{device-types/virtio-scsi/driver-conformance.tex}
 \input{device-types/virtio-input/driver-conformance.tex}
-
-\conformance{\subsection}{Crypto Driver Conformance}\label{sec:Conformance / Driver Conformance / Crypto Driver Conformance}
-
-A Crypto driver MUST conform to the following normative statements:
-
-\begin{itemize}
-\item \ref{drivernormative:Device Types / Crypto Device / Device configuration layout}
-\item \ref{drivernormative:Device Types / Crypto Device / Device Initialization}
-\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / Control Virtqueue / Session operation / Session operation: create session}
-\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / Control Virtqueue / Session operation / Session operation: destroy session}
-\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / HASH Service Operation}
-\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / MAC Service Operation}
-\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / Symmetric algorithms Operation}
-\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / AEAD Service Operation}
-\end{itemize}
+\input{device-types/virtio-crypto/driver-conformance.tex}
 
 \conformance{\subsection}{Socket Driver Conformance}\label{sec:Conformance / Driver Conformance / Socket Driver Conformance}
 
@@ -341,6 +327,7 @@ \section{Conformance Targets}\label{sec:Conformance / Conformance Targets}
 \input{device-types/virtio-scsi/device-conformance.tex}
 \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}
 
@@ -355,6 +342,17 @@ \section{Conformance Targets}\label{sec:Conformance / Conformance Targets}
 \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}
 
diff --git a/content.tex b/content.tex
index f5954ea..f7cbecb 100644
--- a/content.tex
+++ b/content.tex
@@ -3011,7 +3011,7 @@ \chapter{Device Types}\label{sec:Device Types}
 \input{device-types/virtio-scsi/description.tex}
 \input{device-types/virtio-gpu/description.tex}
 \input{device-types/virtio-input/description.tex}
-\input{virtio-crypto.tex}
+\input{device-types/virtio-crypto/description.tex}
 \input{virtio-vsock.tex}
 \input{virtio-fs.tex}
 \input{virtio-rpmb.tex}
diff --git a/virtio-crypto.tex b/device-types/virtio-crypto/description.tex
similarity index 100%
rename from virtio-crypto.tex
rename to device-types/virtio-crypto/description.tex
diff --git a/device-types/virtio-crypto/device-conformance.tex b/device-types/virtio-crypto/device-conformance.tex
new file mode 100644
index 0000000..1667120
--- /dev/null
+++ b/device-types/virtio-crypto/device-conformance.tex
@@ -0,0 +1,13 @@
+\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}
diff --git a/device-types/virtio-crypto/driver-conformance.tex b/device-types/virtio-crypto/driver-conformance.tex
new file mode 100644
index 0000000..672d0f6
--- /dev/null
+++ b/device-types/virtio-crypto/driver-conformance.tex
@@ -0,0 +1,14 @@
+\conformance{\subsection}{Crypto Driver Conformance}\label{sec:Conformance / Driver Conformance / Crypto Driver Conformance}
+
+A Crypto driver MUST conform to the following normative statements:
+
+\begin{itemize}
+\item \ref{drivernormative:Device Types / Crypto Device / Device configuration layout}
+\item \ref{drivernormative:Device Types / Crypto Device / Device Initialization}
+\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / Control Virtqueue / Session operation / Session operation: create session}
+\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / Control Virtqueue / Session operation / Session operation: destroy session}
+\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / HASH Service Operation}
+\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / MAC Service Operation}
+\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / Symmetric algorithms Operation}
+\item \ref{drivernormative:Device Types / Crypto Device / Device Operation / AEAD Service Operation}
+\end{itemize}
-- 
2.26.2