Peter Maydell <peter.mayd...@linaro.org> writes:
> From: Paolo Bonzini <pbonz...@redhat.com> > > The only remaining content in qemu-tech.texi is a few paragraphs > about managed start up options. Move them in the main section > about full system emulation. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > Message-id: 20200226113034.6741-11-pbonz...@redhat.com > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Reviewed-by: Alex Bennée <alex.ben...@linaro.org> > --- > Makefile | 2 +- > qemu-tech.texi => docs/system/managed-startup.texi | 9 +-------- > qemu-doc.texi | 5 ++--- > 3 files changed, 4 insertions(+), 12 deletions(-) > rename qemu-tech.texi => docs/system/managed-startup.texi (92%) > > diff --git a/Makefile b/Makefile > index 9790a0fd15b..56382a45936 100644 > --- a/Makefile > +++ b/Makefile > @@ -1120,7 +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-tech.texi qemu-option-trace.texi \ > + qemu-option-trace.texi \ > qemu-deprecated.texi qemu-monitor.texi \ > qemu-monitor-info.texi \ > docs/system/quickstart.texi \ > diff --git a/qemu-tech.texi b/docs/system/managed-startup.texi > similarity index 92% > rename from qemu-tech.texi > rename to docs/system/managed-startup.texi > index 35da6a40af1..ec168095cc4 100644 > --- a/qemu-tech.texi > +++ b/docs/system/managed-startup.texi > @@ -1,11 +1,4 @@ > -@node Implementation notes > -@appendix Implementation notes > - > -@menu > -* Managed start up options:: > -@end menu > - > -@node Managed start up options > +@node managed_startup > @section Managed start up options > > In system mode emulation, it's possible to create a VM in a paused state > using > diff --git a/qemu-doc.texi b/qemu-doc.texi > index f702dce4557..e4bff7edbee 100644 > --- a/qemu-doc.texi > +++ b/qemu-doc.texi > @@ -39,7 +39,6 @@ > * QEMU System emulator:: > * QEMU System emulator targets:: > * Security:: > -* Implementation notes:: > * Deprecated features:: > * Recently removed features:: > * Supported build platforms:: > @@ -144,6 +143,7 @@ accelerator is required to use more than one host CPU for > emulation. > * vnc_security:: VNC security > * network_tls:: TLS setup for network services > * gdb_usage:: GDB usage > +* managed_startup:: Managed startup options > @end menu > > @include docs/system/quickstart.texi > @@ -159,6 +159,7 @@ accelerator is required to use more than one host CPU for > emulation. > @include docs/system/vnc-security.texi > @include docs/system/tls.texi > @include docs/system/gdb.texi > +@include docs/system/managed-startup.texi > > @node QEMU System emulator targets > @chapter QEMU System emulator targets > @@ -190,8 +191,6 @@ various targets are mentioned in the following sections. > > @include docs/security.texi > > -@include qemu-tech.texi > - > @include qemu-deprecated.texi > > @include docs/system/build-platforms.texi -- Alex Bennée
