From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Yi Wang <wang.yi59@zte.com.cn>, qemu-devel@nongnu.org
Cc: xue.zhihong@zte.com.cn, QEMU Trivial <qemu-trivial@nongnu.org>,
wang.liang82@zte.com.cn, Liao Pingfang <liao.pingfang@zte.com.cn>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH] Makefile: Install qemu-[qmp/ga]-ref.* into the directory "interop"
Date: Tue, 9 Jun 2020 06:28:27 +0200 [thread overview]
Message-ID: <94e456a8-0b4f-e1fd-7baa-8f81f36c6872@redhat.com> (raw)
In-Reply-To: <1591663670-47712-1-git-send-email-wang.yi59@zte.com.cn>
On 6/9/20 2:47 AM, Yi Wang wrote:
> From: Liao Pingfang <liao.pingfang@zte.com.cn>
>
> We need install qemu-[qmp/ga]-ref.* files into the subdirectory of qemu docs: interop.
>
> If we visit the following address and click the link to qemu-qmp-ref.html:
> https://www.qemu.org/docs/master/interop/bitmaps.html#basic-qmp-usage
>
> It will report following error:
> "
> Not Found
> The requested URL /docs/master/interop/qemu-qmp-ref.html was not found on this server.
> "
>
Fixes: d59157ea058b5 ('docs: create interop/ subdirectory')
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Liao Pingfang <liao.pingfang@zte.com.cn>
> ---
> Makefile | 10 ++++++----
> docs/index.html.in | 4 ++--
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 40e4f76..49dbe7a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -879,8 +879,9 @@ install-sphinxdocs: sphinxdocs
> install-doc: $(DOCS) install-sphinxdocs
> $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
> $(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)"
> - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)"
> - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
> + $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop"
> + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)/interop"
> + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)/interop"
> ifdef CONFIG_POSIX
> $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
> $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1"
> @@ -898,8 +899,9 @@ ifdef CONFIG_TRACE_SYSTEMTAP
> endif
> ifneq (,$(findstring qemu-ga,$(TOOLS)))
> $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8"
> - $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)"
> - $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)"
> + $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop"
> + $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/interop"
> + $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)/interop"
> $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"
> endif
> endif
> diff --git a/docs/index.html.in b/docs/index.html.in
> index e9a1603..6736fa4 100644
> --- a/docs/index.html.in
> +++ b/docs/index.html.in
> @@ -12,8 +12,8 @@
> <li><a href="tools/index.html">Tools Guide</a></li>
> <li><a href="interop/index.html">System Emulation Management and Interoperability Guide</a></li>
> <li><a href="specs/index.html">System Emulation Guest Hardware Specifications</a></li>
> - <li><a href="qemu-qmp-ref.html">QMP Reference Manual</a></li>
> - <li><a href="qemu-ga-ref.html">Guest Agent Protocol Reference</a></li>
> + <li><a href="interop/qemu-qmp-ref.html">QMP Reference Manual</a></li>
> + <li><a href="interop/qemu-ga-ref.html">Guest Agent Protocol Reference</a></li>
> </ul>
> </body>
> </html>
>
next prev parent reply other threads:[~2020-06-09 4:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 0:47 [PATCH] Makefile: Install qemu-[qmp/ga]-ref.* into the directory "interop" Yi Wang
2020-06-09 4:28 ` Philippe Mathieu-Daudé [this message]
2020-06-15 16:12 ` Paolo Bonzini
2020-06-15 16:32 ` Peter Maydell
2020-06-15 16:59 ` Paolo Bonzini
2020-06-15 18:56 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=94e456a8-0b4f-e1fd-7baa-8f81f36c6872@redhat.com \
--to=philmd@redhat.com \
--cc=liao.pingfang@zte.com.cn \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=wang.liang82@zte.com.cn \
--cc=wang.yi59@zte.com.cn \
--cc=xue.zhihong@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).