diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-02-28 15:35:57 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-06 10:04:57 +0000 |
| commit | abcd92db6a7b725e16826ee2e3fcb13cfe3a96c2 (patch) | |
| tree | bd4895fac48e1c1f0e20330f4ce556d85fa62e8a | |
| parent | 2147106172266c3f38b167ead97bd17eeaab85a0 (diff) | |
qemu-doc: move included files to docs/system
Since qemu-doc.texi is mostly including files from docs/system,
move the existing include files there for consistency.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20200228153619.9906-12-peter.maydell@linaro.org
Message-id: 20200226113034.6741-12-pbonzini@redhat.com
[PMM: update MAINTAINERS line for qemu-option-trace.texi]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | docs/system/deprecated.texi (renamed from qemu-deprecated.texi) | 0 | ||||
| -rw-r--r-- | docs/system/qemu-option-trace.texi (renamed from qemu-option-trace.texi) | 0 | ||||
| -rw-r--r-- | docs/system/security.texi (renamed from docs/security.texi) | 0 | ||||
| -rw-r--r-- | qemu-doc.texi | 4 | ||||
| -rw-r--r-- | qemu-options.hx | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 615615c32f..584264535c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2234,7 +2234,7 @@ M: Stefan Hajnoczi <stefanha@redhat.com> S: Maintained F: trace/ F: trace-events -F: qemu-option-trace.texi +F: docs/system/qemu-option-trace.texi F: scripts/tracetool.py F: scripts/tracetool/ F: scripts/qemu-trace-stap* @@ -2804,7 +2804,8 @@ F: contrib/gitdm/* Incompatible changes R: libvir-list@redhat.com -F: qemu-deprecated.texi +F: docs/system/deprecated.texi +F: docs/system/deprecated.rst Build System ------------ @@ -1110,7 +1110,7 @@ docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi @cp -p $< $@ qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi -qemu.1: qemu-option-trace.texi +qemu.1: docs/system/qemu-option-trace.texi docs/system/qemu-cpu-models.7: docs/system/qemu-cpu-models.texi docs/system/cpu-models-x86.texi docs/system/cpu-models-mips.texi html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs @@ -1120,8 +1120,7 @@ txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \ qemu-options.texi \ - qemu-option-trace.texi \ - qemu-deprecated.texi qemu-monitor.texi \ + qemu-monitor.texi \ qemu-monitor-info.texi \ docs/system/quickstart.texi \ docs/system/invocation.texi \ @@ -1140,7 +1139,8 @@ qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \ docs/system/build-platforms.texi \ docs/system/license.texi \ docs/system/cpu-models-x86.texi docs/system/cpu-models-mips.texi \ - docs/security.texi + docs/system/deprecated.texi docs/system/qemu-option-trace.texi \ + docs/system/security.texi docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \ docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \ diff --git a/qemu-deprecated.texi b/docs/system/deprecated.texi index 66eca3a1de..66eca3a1de 100644 --- a/qemu-deprecated.texi +++ b/docs/system/deprecated.texi diff --git a/qemu-option-trace.texi b/docs/system/qemu-option-trace.texi index 162f1528d2..162f1528d2 100644 --- a/qemu-option-trace.texi +++ b/docs/system/qemu-option-trace.texi diff --git a/docs/security.texi b/docs/system/security.texi index 0d6b30edfc..0d6b30edfc 100644 --- a/docs/security.texi +++ b/docs/system/security.texi diff --git a/qemu-doc.texi b/qemu-doc.texi index e4bff7edbe..d3e743719a 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -189,9 +189,9 @@ various targets are mentioned in the following sections. @include docs/system/target-m68k.texi @include docs/system/target-xtensa.texi -@include docs/security.texi +@include docs/system/security.texi -@include qemu-deprecated.texi +@include docs/system/deprecated.texi @include docs/system/build-platforms.texi diff --git a/qemu-options.hx b/qemu-options.hx index 084a1c1f8c..5a4ac8e239 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4221,7 +4221,7 @@ HXCOMM This line is not accurate, as some sub-options are backend-specific but HXCOMM HX does not support conditional compilation of text. @item -trace [[enable=]@var{pattern}][,events=@var{file}][,file=@var{file}] @findex -trace -@include qemu-option-trace.texi +@include docs/system/qemu-option-trace.texi ETEXI DEF("plugin", HAS_ARG, QEMU_OPTION_plugin, "-plugin [file=]<file>[,arg=<string>]\n" |